From 018a42790ce12d19940991a49e26f85e7717159c Mon Sep 17 00:00:00 2001 From: Andriy Gelman Date: Wed, 12 Feb 2020 18:36:56 -0500 Subject: [PATCH] avcodec/h264_ps: Return error if pps has FMO parameters FMO is not supported and fields related to FMO are not parsed, meaning that any fields which follow will be corrupt. Signed-off-by: James Almer --- libavcodec/h264_ps.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index d36921e47b..708594954c 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -794,7 +794,9 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct pps->slice_group_count = get_ue_golomb(gb) + 1; if (pps->slice_group_count > 1) { pps->mb_slice_group_map_type = get_ue_golomb(gb); - av_log(avctx, AV_LOG_ERROR, "FMO not supported\n"); + avpriv_report_missing_feature(avctx, "FMO"); + ret = AVERROR_PATCHWELCOME; + goto fail; } pps->ref_count[0] = get_ue_golomb(gb) + 1; pps->ref_count[1] = get_ue_golomb(gb) + 1;