From patchwork Thu Jan 5 11:07:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 39884 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp297431pzb; Thu, 5 Jan 2023 03:08:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXuVHXjJ94Qzn7Khih7R9wiIVzNkuxz9aAt4j52DHtHJVnUqH5/pOyQHI+jI62hB4W2bUWTQ X-Received: by 2002:a05:6402:f04:b0:46d:ca42:2e59 with SMTP id i4-20020a0564020f0400b0046dca422e59mr48671644eda.11.1672916908210; Thu, 05 Jan 2023 03:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672916908; cv=none; d=google.com; s=arc-20160816; b=fjCuGlyaO70H24Vh9dNWjLSrA62nN6nPDK7+xJ0wvPQMA8gJDI2pjQTlVteoaM5EHN 5YAEnI8D+kgfEAJ0/joZdeVRpYhfd3tLTXJMnxhIuF9DngcNgeTX4/n7JWIswKVUUJ7/ XG1NxbvOyVfpvdyjYsuMoR7VOrAmCTCxdoB8EKfcW+IVuKFzR4qvnwf2WdUUU+jhIhbp gEsTsSE+egUNYf0bzaRHRLswnYyS12NLCknuGtpgi19CUTRyC7vP1cuaMmNsvsRw9Y9N ZHL2am7r2+tvdDDXlQaF/RFVIaI/nIeVODoFL1ENkH0OA7lvfkPZaYp0Q5cQvmqZRxZi uVdw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=kD8HDPz4Txc+NxsQzonky1QtmrZEW+E/1a41BXKdn9I=; b=Rz+QmLuzyayWCPpfiYzyJJL9vwTbwRBGd99PVmdWODlYR0f/71HKZ+oLf0iA4bkPx9 e16srD7IJJtFl6zwEQ9fQ0dG0GMZT4MG9rRb7Yum53vDvJowe/dAfGjR1iX/1m0y57nW WPldoxJvWLHwLL5U4fyDrz8O4IUUVjH0EY7y9GdbH5pjegVMoI9bBBjc023nNEtwHWS5 sO2OrJ18p1N1oBtv3j8ekfFWBJCq3AQPw7tniZoEV/O1ceX1GGQB5aumRexVKNnI0ZFS eelZAYNRP7uRIQjwIEnd/8Ey+QLlQslPvZ4xrOI1gjoiW1HXsS9s6HSozftfgy4ZS89m C0NQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id wu8-20020a170906eec800b007a1d4f0e7fcsi16635540ejb.655.2023.01.05.03.08.27; Thu, 05 Jan 2023 03:08:28 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A01B368BD12; Thu, 5 Jan 2023 13:08:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0D8E68B71D for ; Thu, 5 Jan 2023 13:08:00 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6095E2404F8 for ; Thu, 5 Jan 2023 12:08:00 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 0QUZKDRicB-H for ; Thu, 5 Jan 2023 12:07:59 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id D25592404F7 for ; Thu, 5 Jan 2023 12:07:58 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 9E4153A034A for ; Thu, 5 Jan 2023 12:07:58 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Jan 2023 12:07:55 +0100 Message-Id: <20230105110756.473-3-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230105110756.473-1-anton@khirnov.net> References: <20230105110756.473-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavc/decode: deduplicate cleanup in ff_decode_receive_frame() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: V8AeXEaaCzzE --- libavcodec/decode.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 3e5be501b9..56ba06d5d5 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -685,10 +685,8 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { ret = apply_cropping(avctx, frame); - if (ret < 0) { - av_frame_unref(frame); - return ret; - } + if (ret < 0) + goto fail; } avctx->frame_number++; @@ -706,10 +704,8 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) avci->initial_sample_rate = frame->sample_rate ? frame->sample_rate : avctx->sample_rate; ret = av_channel_layout_copy(&avci->initial_ch_layout, &frame->ch_layout); - if (ret < 0) { - av_frame_unref(frame); - return ret; - } + if (ret < 0) + goto fail; break; } } @@ -735,12 +731,15 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame) " drop count: %d \n", avctx->frame_number, frame->pts, avci->changed_frames_dropped); - av_frame_unref(frame); - return AVERROR_INPUT_CHANGED; + ret = AVERROR_INPUT_CHANGED; + goto fail; } } } return 0; +fail: + av_frame_unref(frame); + return ret; } static void get_subtitle_defaults(AVSubtitle *sub)