[FFmpeg-devel,v3,1/3] lavc/libdavs2: fix sequence incomplete output error

Submitted by hwren on Nov. 1, 2018, 4:14 a.m.

Details

Message ID 1541045681-5374-1-git-send-email-hwrenx@126.com
State New
Headers show

Commit Message

hwren Nov. 1, 2018, 4:14 a.m.
Signed-off-by: hwren <hwrenx@126.com>
---
 libavcodec/libdavs2.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Patch hide | download patch | download mbox

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;