Browse Source

h264: tighten the valid range for ref_frame_count

This field (which the spec calls max_num_ref_frames) must be less than
or equal to MaxDpbFrames, which is at most 16.
tags/n3.2
Anton Khirnov 9 years ago
parent
commit
70b1dcef2d
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavcodec/h264_ps.c

+ 1
- 2
libavcodec/h264_ps.c View File

@@ -431,8 +431,7 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx,
}

sps->ref_frame_count = get_ue_golomb_31(gb);
if (sps->ref_frame_count > H264_MAX_PICTURE_COUNT - 2 ||
sps->ref_frame_count >= 32U) {
if (sps->ref_frame_count > MAX_DELAYED_PIC_COUNT) {
av_log(avctx, AV_LOG_ERROR,
"too many reference frames %d\n", sps->ref_frame_count);
goto fail;


Loading…
Cancel
Save