From patchwork Thu Nov 1 04:14:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hwren X-Patchwork-Id: 10872 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 9AD6E44CF78 for ; Thu, 1 Nov 2018 06:14:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0806668A893; Thu, 1 Nov 2018 06:14:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from m15-113.126.com (m15-113.126.com [220.181.15.113]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D3D668A81C for ; Thu, 1 Nov 2018 06:14:15 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id; bh=A2KmQhnGfdFHnNGBJB q46ng3TMFJyowQOWzbmAR25JE=; b=B2yljA760FkqjZHfb6j5hM+082fXu7MsTN d09S4x7RRiaSviGYq6vijd0lyNMZ2g85CRLXaCNy2E9dCSkfa9I//VuKCbE1cXPM uCD8D8XswfHe5sxToZY7o2behVXJIr2ziOSb2m5vLV7ZY7CrJKCnVsDfqOeSnrkb H60AmUXxI= Received: from localhost.localdomain (unknown [162.105.162.85]) by smtp3 (Coremail) with SMTP id DcmowACny_CzfdpbzqPvLw--.40124S3; Thu, 01 Nov 2018 12:14:44 +0800 (CST) From: hwren To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Nov 2018 12:14:39 +0800 Message-Id: <1541045681-5374-1-git-send-email-hwrenx@126.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <3d0c42ab.4c0c.166cd486c77.Coremail.hwrenx@126.com> References: <3d0c42ab.4c0c.166cd486c77.Coremail.hwrenx@126.com> X-CM-TRANSID: DcmowACny_CzfdpbzqPvLw--.40124S3 X-Coremail-Antispam: 1Uf129KBjvdXoWruw1xurWrJw45tw1rCryxGrg_yoWfGrg_KF 1UX34DAryUCay7G3yUGrZIv3yrWw4rCF48W3W7trsagr17Xrn8XFsrXrn2va9xuw4vyFy8 Cw1DZryfJw4FgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8zuWPUUUUU== X-Originating-IP: [162.105.162.85] X-CM-SenderInfo: pkzuv0b06rjloofrz/1tbi4hTx6VpD6uaCoAAAsZ Subject: [FFmpeg-devel] [PATCH v3 1/3] lavc/libdavs2: fix sequence incomplete output error 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" Signed-off-by: hwren --- libavcodec/libdavs2.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index cadf995..e463b2e 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -129,7 +129,16 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data, int ret = DAVS2_DEFAULT; if (!buf_size) { - return 0; + ret = davs2_decoder_flush(cad->decoder, &cad->headerset, &cad->out_frame); + if (ret == DAVS2_END) { + return 0; + } else if (ret == DAVS2_GOT_FRAME) { + *got_frame = davs2_dump_frames(avctx, &cad->out_frame, &cad->headerset, ret, frame); + davs2_decoder_frame_unref(cad->decoder, &cad->out_frame); + return ret; + } else { + return AVERROR_EXTERNAL; + } } cad->packet.data = buf_ptr;