[FFmpeg-cvslog] avcodec/av1_parser: don't abort parsing the first frame if extradata parsing fails

James Almer git at videolan.org
Tue Mar 26 01:00:16 EET 2019


ffmpeg | branch: release/4.1 | James Almer <jamrial at gmail.com> | Sun Mar 24 18:22:32 2019 -0300| [abf36b76de63b4cdf07e0f8360422ff4758f7f70] | committer: James Almer

avcodec/av1_parser: don't abort parsing the first frame if extradata parsing fails

The first frame contains the sequence header, which is needed to parse every
following frame.

This fixes parsing streams with broken extradata but correct packet data.

Signed-off-by: James Almer <jamrial at gmail.com>
(cherry picked from commit 699d0c2a30d5b2a10b6a0f459a35d665dc22b2f1)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=abf36b76de63b4cdf07e0f8360422ff4758f7f70
---

 libavcodec/av1_parser.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c
index 8df66498f4..0390de0b36 100644
--- a/libavcodec/av1_parser.c
+++ b/libavcodec/av1_parser.c
@@ -68,8 +68,7 @@ static int av1_parser_parse(AVCodecParserContext *ctx,
 
         ret = ff_cbs_read(s->cbc, td, avctx->extradata, avctx->extradata_size);
         if (ret < 0) {
-            av_log(avctx, AV_LOG_ERROR, "Failed to parse extradata.\n");
-            goto end;
+            av_log(avctx, AV_LOG_WARNING, "Failed to parse extradata.\n");
         }
 
         ff_cbs_fragment_uninit(s->cbc, td);



More information about the ffmpeg-cvslog mailing list