[FFmpeg-cvslog] qsvdec: Fix running with assert_level > 0

Mark Thompson git at videolan.org
Sun Dec 9 20:56:21 EET 2018


ffmpeg | branch: master | Mark Thompson <sw at jkqxz.net> | Sun Nov 11 15:32:15 2018 +0000| [34cab708189bdde8f59543a885313928a980564d] | committer: Mark Thompson

qsvdec: Fix running with assert_level > 0

Assertion avctx->codec_id != AV_CODEC_ID_NONE failed at src/libavcodec/parser.c:128

The setting on the internal AVCodecContext used for parsing only is
otherwise irrelevant, so just set it to avoid the assert.

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

 libavcodec/qsvdec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 6753e596a1..4a0be811fb 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -501,6 +501,8 @@ int ff_qsv_process_data(AVCodecContext *avctx, QSVContext *q,
         if (!q->avctx_internal)
             return AVERROR(ENOMEM);
 
+        q->avctx_internal->codec_id = avctx->codec_id;
+
         q->parser = av_parser_init(avctx->codec_id);
         if (!q->parser)
             return AVERROR(ENOMEM);



More information about the ffmpeg-cvslog mailing list