[FFmpeg-devel] [PATCH] avcodec/h264_pc: Return error if pps has FMO parameters

[Andriy Gelman]

From: Andriy Gelman <andriy.gelman at gmail.com>

FMO is not supported and fields related to FMO are not parsed, meaning
that any fields which follow will be corrupt.
---
 libavcodec/h264_ps.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index edbaa96b64e..80216854079 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -794,6 +794,8 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct
     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");
+        ret = AVERROR_PATCHWELCOME;
+        goto fail;
     }
     pps->ref_count[0] = get_ue_golomb(gb) + 1;
     pps->ref_count[1] = get_ue_golomb(gb) + 1;
-- 
2.25.0