Commit 018a4279 authored by Andriy Gelman's avatar Andriy Gelman Committed by James Almer

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: 's avatarJames Almer <jamrial@gmail.com>
parent 13dc9039
...@@ -794,7 +794,9 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct ...@@ -794,7 +794,9 @@ int ff_h264_decode_picture_parameter_set(GetBitContext *gb, AVCodecContext *avct
pps->slice_group_count = get_ue_golomb(gb) + 1; pps->slice_group_count = get_ue_golomb(gb) + 1;
if (pps->slice_group_count > 1) { if (pps->slice_group_count > 1) {
pps->mb_slice_group_map_type = get_ue_golomb(gb); 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[0] = get_ue_golomb(gb) + 1;
pps->ref_count[1] = get_ue_golomb(gb) + 1; pps->ref_count[1] = get_ue_golomb(gb) + 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment