From patchwork Thu Dec 15 15:00:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 1805 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp792647vsa; Thu, 15 Dec 2016 07:00:45 -0800 (PST) X-Received: by 10.28.19.67 with SMTP id 64mr1773310wmt.111.1481814044997; Thu, 15 Dec 2016 07:00:44 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u197si2941650wmu.25.2016.12.15.07.00.44; Thu, 15 Dec 2016 07:00:44 -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 27E8A689A81; Thu, 15 Dec 2016 17:00:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C2E63680C83 for ; Thu, 15 Dec 2016 17:00:29 +0200 (EET) Received: from mfilter2-d.gandi.net (mfilter2-d.gandi.net [217.70.178.140]) by relay3-d.mail.gandi.net (Postfix) with ESMTP id 63559A80E6 for ; Thu, 15 Dec 2016 16:00:35 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter2-d.gandi.net Received: from relay3-d.mail.gandi.net ([IPv6:::ffff:217.70.183.195]) by mfilter2-d.gandi.net (mfilter2-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id fZpcEmvrv2aY for ; Thu, 15 Dec 2016 16:00:33 +0100 (CET) X-Originating-IP: 213.47.41.20 Received: from localhost (213-47-41-20.cable.dynamic.surfer.at [213.47.41.20]) (Authenticated sender: michael@niedermayer.cc) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 43208A8166 for ; Thu, 15 Dec 2016 16:00:27 +0100 (CET) Date: Thu, 15 Dec 2016 16:00:07 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20161215150007.GX4749@nb4> References: <1481778350-5095-1-git-send-email-pkoshevoy@gmail.com> MIME-Version: 1.0 In-Reply-To: <1481778350-5095-1-git-send-email-pkoshevoy@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Subject: Re: [FFmpeg-devel] [PATCH] lavc: Fix ticket 6024 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Wed, Dec 14, 2016 at 10:05:50PM -0700, pkoshevoy@gmail.com wrote: > From: Pavel Koshevoy > > --- > libavcodec/utils.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/libavcodec/utils.c b/libavcodec/utils.c > index 44ecc09..2ad96e4 100644 > --- a/libavcodec/utils.c > +++ b/libavcodec/utils.c > @@ -2788,8 +2788,6 @@ static int do_decode(AVCodecContext *avctx, AVPacket *pkt) > if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { > ret = avcodec_decode_video2(avctx, avctx->internal->buffer_frame, > &got_frame, pkt); > - if (ret >= 0) > - ret = pkt->size; > } else if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) { > ret = avcodec_decode_audio4(avctx, avctx->internal->buffer_frame, > &got_frame, pkt); This breaks fate Test iscc failed. Look at tests/data/fate/iscc.err for details. make: *** [fate-iscc] Error 137 [...] --- ./tests/ref/fate/rscc-32bit 2016-12-15 04:39:33.924670759 +0100 +++ tests/data/fate/rscc-32bit 2016-12-15 15:59:04.507407670 +0100 @@ -3,11 +3,3 @@ #codec_id 0: rawvideo #dimensions 0: 320x240 #sar 0: 0/1 -0, 0, 0, 1, 307200, 0xe36c2c38 -0, 1, 1, 1, 307200, 0xa2e3476b -0, 2, 2, 1, 307200, 0x65167c95 -0, 3, 3, 1, 307200, 0x6acd02ac -0, 4, 4, 1, 307200, 0x37935e0b -0, 5, 5, 1, 307200, 0x8e6918bc -0, 6, 6, 1, 307200, 0x0a246578 -0, 7, 7, 1, 307200, 0x9c1a2f4c Test rscc-32bit failed. Look at tests/data/fate/rscc-32bit.err for details. make: *** [fate-rscc-32bit] Error 137 make: *** Waiting for unfinished jobs.... --- ./tests/ref/fate/rscc-16bit 2016-12-15 04:39:33.924670759 +0100 +++ tests/data/fate/rscc-16bit 2016-12-15 15:59:04.491407670 +0100 @@ -3,18 +3,3 @@ #codec_id 0: rawvideo #dimensions 0: 320x240 #sar 0: 0/1 -0, 0, 0, 1, 153600, 0x33759daf -0, 1, 1, 1, 153600, 0x43e0c910 -0, 2, 2, 1, 153600, 0x6c75a8f0 -0, 3, 3, 1, 153600, 0xaace1255 -0, 4, 4, 1, 153600, 0x42d3f439 -0, 5, 5, 1, 153600, 0xb225b396 -0, 6, 6, 1, 153600, 0xa615221c -0, 7, 7, 1, 153600, 0x5401f5a9 -0, 8, 8, 1, 153600, 0xd274cef3 -0, 9, 9, 1, 153600, 0x7935f992 -0, 10, 10, 1, 153600, 0x7669e7c6 -0, 11, 11, 1, 153600, 0x527bd6a1 -0, 12, 12, 1, 153600, 0x0f33b2ed -0, 13, 13, 1, 153600, 0xe62ddb32 -0, 14, 14, 1, 153600, 0x81541aa2 Test rscc-16bit failed. Look at tests/data/fate/rscc-16bit.err for details. make: *** [fate-rscc-16bit] Error 137 --- ./tests/ref/fate/iscc 2016-12-15 04:39:33.920670759 +0100 +++ tests/data/fate/iscc 2016-12-15 15:59:04.479407669 +0100 @@ -3,8 +3,3 @@ #codec_id 0: rawvideo #dimensions 0: 1760x968 #sar 0: 0/1 -0, 0, 0, 1, 6814720, 0x1365f8ef -0, 1, 1, 1, 6814720, 0x90838983 -0, 2, 2, 1, 6814720, 0xf0cc3131 -0, 3, 3, 1, 6814720, 0xc07e404d -0, 4, 4, 1, 6814720, 0x945962dd