From patchwork Fri Nov 27 01:02:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 24083 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 611E244BB5D for ; Fri, 27 Nov 2020 03:11:43 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1B5D168BBC7; Fri, 27 Nov 2020 03:07:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C0F768B95C for ; Fri, 27 Nov 2020 03:07:16 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id 23so3944394wrc.8 for ; Thu, 26 Nov 2020 17:07:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BU6ojI/rgQ8tJ7bnaBUDHN0i9KEE/ZBdPt1XENKCg80=; b=IEvOCYpzax/7gJSOunBcBdDfJVFC6kutWgIvCsDF8QQyK7VPUNH+9GyOAy8b96dlQG 9a21CQ3+y7svsucGtvc/9ddDSN1PlQTJlfRDK+5Dpvp1bdIZgD2D/m54rxtbPaZqW5S0 OiW7ZrVjUiTqp1QecpcTOXLgX4ECY8vwOIJl6+6V3aEvm2wjQn/SBhs8n1/qlwqCOL8o qxjJTJMJL4PYeW1ySLfYoV72Cafz2SBwb3bCIqGXOCU0AAuizfg7+9XBNOQ8n35P+Wc3 KkycXxnKz/t3zL++VUM8xMGO63y2vITsYlvfsLAYN1oEl3Qaq/rO5wCl+jhhx17X2bWz GaEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BU6ojI/rgQ8tJ7bnaBUDHN0i9KEE/ZBdPt1XENKCg80=; b=XUz8uSxiwGnMfmEdDzbbMJNSQRmW6C7nU1DK6HDix77DJ6FDfeYwzUac0GFyHaomFm mcAUEu473TUw5W2n3XrP/9pKCoSCk1RCRvOTpeMXLgGcVjrtodCquhU8KqudWuihITl2 ZvXRJcILt9CsE3ZmHmlrxqccP75YDwOUz/6FQ03iTeKxMoqWIARp11DhH5+NTxvWKgAF mIsIDuvTgbLqsi5S+hPRLjxqNfwZaycmyICA5eAppFFj/vjGi6J9+s/4TPFglu3nkII7 VR35ZvbXGlEwEO83G2MBHVBVq2XSWeB4qKIxLv2y5u0qTkMzE/PgZCqL2br/n6swTec/ hu9w== X-Gm-Message-State: AOAM5306UqM06iSJfxHbYF0bVg4Ohyd5Wkmgw7Az9rFGPyLZAnJ3tDm2 8lg97S2uaqJBfZLyaHMMijoxuDFtkBxo/w== X-Google-Smtp-Source: ABdhPJzbf1U//tYbuq5AtGo5yaIXnfN2fbIDwRJj8gLuEGFAxTIdpykyy7psbdPzE0MmNHxChy++mA== X-Received: by 2002:a5d:4a0a:: with SMTP id m10mr7301176wrq.16.1606439234751; Thu, 26 Nov 2020 17:07:14 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l8sm10504450wro.46.2020.11.26.17.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Nov 2020 17:07:14 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Nov 2020 02:02:38 +0100 Message-Id: <20201127010249.2724610-34-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> References: <20201127010249.2724610-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 34/45] avcodec/smvjpegdec: Cleanup generically on init failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/smvjpegdec.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 32756b54f3..807d990d00 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -105,37 +105,29 @@ static av_cold int smvjpeg_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); s->picture[1] = av_frame_alloc(); - if (!s->picture[1]) { - av_frame_free(&s->picture[0]); + if (!s->picture[1]) return AVERROR(ENOMEM); - } s->jpg.picture_ptr = s->picture[0]; codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG); if (!codec) { av_log(avctx, AV_LOG_ERROR, "MJPEG codec not found\n"); - smvjpeg_decode_end(avctx); return AVERROR_DECODER_NOT_FOUND; } s->avctx = avcodec_alloc_context3(codec); - if (!s->avctx) { - smvjpeg_decode_end(avctx); + if (!s->avctx) return AVERROR(ENOMEM); - } av_dict_set(&thread_opt, "threads", "1", 0); s->avctx->refcounted_frames = 1; s->avctx->flags = avctx->flags; s->avctx->idct_algo = avctx->idct_algo; - if ((ret = ff_codec_open2_recursive(s->avctx, codec, &thread_opt)) < 0) { + if ((ret = ff_codec_open2_recursive(s->avctx, codec, &thread_opt)) < 0) av_log(avctx, AV_LOG_ERROR, "MJPEG codec failed to open\n"); - } av_dict_free(&thread_opt); - if (ret < 0) - smvjpeg_decode_end(avctx); return ret; } @@ -219,4 +211,5 @@ AVCodec ff_smvjpeg_decoder = { .close = smvjpeg_decode_end, .decode = smvjpeg_decode_frame, .priv_class = &smvjpegdec_class, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };