From patchwork Sat Nov 11 12:16:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 5984 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp59943jah; Sat, 11 Nov 2017 04:16:20 -0800 (PST) X-Google-Smtp-Source: AGs4zMZRidWndWg7UGlhVFwkEMJqTm6JFEACTiqiFGVj6gn2TpJmvWAzCXVWsEcr6QN1JmZDRnqm X-Received: by 10.223.135.243 with SMTP id c48mr2511000wrc.140.1510402580592; Sat, 11 Nov 2017 04:16:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510402580; cv=none; d=google.com; s=arc-20160816; b=wUWuQFOkTgsp7wOu/sMWOP+EwCt8kIUWCPagYMt7D6YfBepv5PFDSIRzGCYxTC2bqu uPbayBAl+W2jx2kbPte+7pYST+CCBBqQxkhrdjrTgZYSmienoF63C63egpCD7ngeYehh HVmd5VjVnvzwXCCe5f9WyUyauLoIUjJbvAu/3vZU7tcu+fB02UNrapkf6BgVHSQeIWHy hvIaEWMk62d7IoCAgrOhUQfrwqEvr0qnXIrmeLkvfXSCk4Q12VXr48QpmWuXDmkVvWdy +vItdJCgoqMdIYj/KindnzYFzE1Z3G/7YXitQDjWQssUGCOQOm/s/bzvk7USL5vAbAeI oMbw== 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:cc: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=7tn71piPbCNjgS4Kmz9TUwBX+jc0z/Davr8CRi3gEmM=; b=tBOI5NFeFVvGrfFcKYS8YrO05Gcu6FptvdRTw57x9jyRMjSvK7Wtg+paF8A1uz27R3 uvfftfdPwOMGBdZZMs1OZX386cHIpMbhxNjjvlXllW6hsICz+BwxXJyvyOW1/dIJFSJy afBjAPWih4QYcmVxV+Vf5Rb0LtBeF+2HTn94WXmh6DabrmmjcsKEOoKgsR16jht91yOZ EebrAsVcObK+3njwrmST8U/59Nl6WPky4JOt9M0GSx0qqAnFsvsJz1NZOBNKNHiz2zmr 4pljSo24nKFfM73XKph0YZmrskRnPW3GiI5yMrENyNYHorZNInsISv3ddAGRFecdQXdb 1yQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=OO4f7x63; 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 n3si10602854wrg.296.2017.11.11.04.16.20; Sat, 11 Nov 2017 04:16:20 -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; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=OO4f7x63; 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 C0766689B4A; Sat, 11 Nov 2017 14:16:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [5.9.118.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D213A680C15 for ; Sat, 11 Nov 2017 14:15:58 +0200 (EET) Received: from localhost.localdomain (unknown [IPv6:2a02:8109:43f:959c:ba97:5aff:fe10:ec69]) by btbn.de (Postfix) with ESMTPSA id 576BD4BFB1; Sat, 11 Nov 2017 13:16:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rothenpieler.org; s=mail; t=1510402572; bh=TrwJ0KCgBJsacu4LXMHYhrRmnd6ZUWtkqKHHRkCfTIw=; h=From:To:Cc:Subject:Date; b=OO4f7x63xX5v7Wg+HKw1QU81jBcPByHajLGw/1Zb3LztpZ7uqZYhv4Y0KDp1EYmlH wtx1bbPsjC2recNjg/hgbjwSYSCr0/zb4MV81fLNS6OwlEv8KIpoZEqaP4XtECmEcw u+79sLZQyNHFe56dXewTdwoG7efn7eZFehNeDtIE= From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 Nov 2017 13:16:05 +0100 Message-Id: <20171111121606.3901-1-timo@rothenpieler.org> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/decode: always free private_ref 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: michael@niedermayer.cc, Timo Rothenpieler MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There is no reason to keep this intact when decoding failed, specially as private_ref is supposed to always be NULL when a frame is returned to the user. --- libavcodec/decode.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 570799f6d7..7601d16082 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -613,7 +613,6 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) if (ret == AVERROR_EOF) avci->draining_done = 1; - /* free the per-frame decode data */ if (!ret) { /* the only case where decode data is not set should be decoders * that do not call ff_get_buffer() */ @@ -631,10 +630,11 @@ static int decode_receive_frame_internal(AVCodecContext *avctx, AVFrame *frame) } } } - - av_buffer_unref(&frame->private_ref); } + /* free the per-frame decode data */ + av_buffer_unref(&frame->private_ref); + return ret; }