From patchwork Tue Oct 3 04:55:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 5391 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp2293820jan; Mon, 2 Oct 2017 21:56:55 -0700 (PDT) X-Received: by 10.28.66.16 with SMTP id p16mr13307499wma.11.1507006615775; Mon, 02 Oct 2017 21:56:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507006615; cv=none; d=google.com; s=arc-20160816; b=AAuplLl0xDxs2bfcOyNmRIItd5lvic21HdsW1yiH/pdwSEMvowdnm9aVk3E/47SXB4 FLPfypyzUKP/EDTRUKjEHg2LbIt6x3DKI7ihITOZCK2Bzt8ngxmllb2RVH1N7LP1/FY+ 3B1hvesn1x90nCv0q08v+0/Di2wDc/3KdAwzSLKlQkqh05KbQ8YgiU2RoII6ohK8r0vB SpDxP2GcOKh9Bsv5l3XzxNkqNnFNMviuMohmcJcGu97tO2TVniETUBnEd+fKv2UMM4a1 gSVu37EH1xcSPfuY2lg0d8jfVKUBPbQ/5GwfC8jEc3riDl011GHQSF78I7F5gI0oKam/ dzDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=3SscpDmjJkeFsGN03yd4XMOmqDGt24Vf7GSGQLOw/Vg=; b=VXH7LEj9+vdElMf98w9Nqu1EnqsCGEBcbG+KSdivtqAnVY0aY7cc2urrk7elQoTeq7 IWA6JzhTd/l++6R/3fP97jrm1OwsWFCZvmFjS10bTskxMeLpdTDfVFV4o03IkSWSiSiY Xz+k3Rr3XloXfpnvyloUF24WQ5jmyu4asywaMNeIrUSHeTtVzucRC+5hoORDPDcSSe6g ovHvQpTuI/8+arVTxB8PyX+1XjTf4dnYBpqZ5kNdgu7+WeE/odb+9XvJCPMS8jK/DBpY PKqxZqOZl5kjEPkfF0AREYJnoFGt8tQTf+/WaFt6Y1GQMzxHKp1yJrREopUEhp2ywb5b GZpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QNintydR; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l70si1015154wmi.199.2017.10.02.21.56.54; Mon, 02 Oct 2017 21:56:55 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QNintydR; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 74930689EA7; Tue, 3 Oct 2017 07:56:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A903E689D6B for ; Tue, 3 Oct 2017 07:56:33 +0300 (EEST) Received: by mail-qk0-f196.google.com with SMTP id a12so2561565qka.4 for ; Mon, 02 Oct 2017 21:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=bVwokjozuJqHihJ3cvG0B6MGJpPY+1kGmn4WTm9mqwU=; b=QNintydRcW0mj5+H9+wf4fKxuZN3tQZpwTzoqZKQbOQWsV1SiNG7pS1/LljqNjP1nX fSU4tFRkVO9OQrWk9ZiYUii2JblDG+HmLj2nDYzUgicyfV5iH+LfHtd7WpLiWwSQsksN 4PuwC4lUqXnunwWg8tYBqWD7MxIV8e1gN9fuhpZPve4rde9pmcj3myYmlxTWmiL5+s2u HdbqbVu9RePW8ww8rrhVn7d+hs5zhk9twato3WBZ6Q8a2Rr44gcxXwwq8Ef3ENUdITK+ Gyv7yjXDv0A8c5VWhFzLP2KwvRv+ofgEkvYBnf8JqVI02zaMP4/56/cyThXipGMjKH+z 8gNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=bVwokjozuJqHihJ3cvG0B6MGJpPY+1kGmn4WTm9mqwU=; b=a+ycsXDYzfszXOxu3xCpmutg9t5/wD9JpQWDgdzdEjxLgQXtTkMT1Lzq/+ri8j8YeD 0trZOaTNsxpmdec4W9k5/ZYb7/wdZki8noGyiiaqc/25M+9LPJkGOr8oiMrKGg/IX4Xw C4hjrEDKHHyc1GKFIjnJrtcWyA9x1fbnoPFJhTncAgrzMuUmk0btPKnf2YqQmhG99kNl cUwbVzPJUuYi9DOt29R5famfO8d1v1TRG0qriBir9qYImr1xWvukyF5I+wAPYvldmGD6 GWR9fzMeG0r8OLhFvG26B0Cg81hfapkJp41o5O++u76AmC6t4TZoQP0T6dR6M8HA/c+W zY5A== X-Gm-Message-State: AMCzsaWyjS5hGewQSkdVfLWJAYRL5GfNsuDPK9ClsW7ceu64xiexxvWN xT5Ai6IkIF9snGVgNoxvorwXPg== X-Google-Smtp-Source: AOwi7QDDnTZBtP3k6ZnvnpT2O4VSiKFfpM/KEce/cq08Jpaz71cbLhkZZqJve2ecweO7vOShoGPC8g== X-Received: by 10.55.87.133 with SMTP id l127mr17465982qkb.212.1507006607009; Mon, 02 Oct 2017 21:56:47 -0700 (PDT) Received: from localhost.localdomain ([181.231.68.242]) by smtp.gmail.com with ESMTPSA id z26sm2541983qtz.52.2017.10.02.21.56.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Oct 2017 21:56:46 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Oct 2017 01:55:44 -0300 Message-Id: <20171003045544.6632-1-jamrial@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [FFmpeg-devel] [PATCH] avcodec/encode: don't return immediately on 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes memleaks introduced by skipping cleanup at the end of the functions. Regression since a22c6a4796ca1f2cbee6784262515da876fbec22. Signed-off-by: James Almer --- libavcodec/encode.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index c152228c92..841a185738 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -225,10 +225,10 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx, } else if (!avpkt->buf) { AVPacket tmp = { 0 }; ret = av_packet_ref(&tmp, avpkt); - if (ret < 0) - return ret; - av_packet_unref(avpkt); - *avpkt = tmp; + if (!ret) { + av_packet_unref(avpkt); + *avpkt = tmp; + } } } @@ -324,10 +324,10 @@ int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx, } else if (!avpkt->buf) { AVPacket tmp = { 0 }; ret = av_packet_ref(&tmp, avpkt); - if (ret < 0) - return ret; - av_packet_unref(avpkt); - *avpkt = tmp; + if (!ret) { + av_packet_unref(avpkt); + *avpkt = tmp; + } } }