[FFmpeg-devel] [PATCH 3/3] qsvdec: Fix running with assert_level > 0

[Li, Zhong]

> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces at ffmpeg.org] On Behalf
> Of Mark Thompson
> Sent: Sunday, November 11, 2018 11:32 PM
> To: ffmpeg-devel at ffmpeg.org
> Subject: [FFmpeg-devel] [PATCH 3/3] 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.
> ---
>  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);
> --
> 2.19.1
> 
LGTM (And I am surprised it get cached so late).