Re: [FFmpeg-devel] [PATCH v4 1/4] lavc/libdavs2: fix sequence incomplete output error
2018-11-02 9:47 GMT+01:00, hwren : > 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; Do I understand correctly that this is not supposed to happen? If it can happen, please print an error message. Carl Eugen ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH v4 1/4] lavc/libdavs2: fix sequence incomplete output error
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; -- 2.7.4 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel