Browse Source

H.264 max reference pictures fix by (Loren Merritt <lorenm at u dot washington dot edu>)

Originally committed as revision 3504 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 20 years ago
parent
commit
5cbb0e70a0
2 changed files with 4 additions and 1 deletions
  1. +3
    -0
      libavcodec/h264.c
  2. +1
    -1
      libavcodec/mpegvideo.h

+ 3
- 0
libavcodec/h264.c View File

@@ -5430,6 +5430,9 @@ static inline int decode_seq_parameter_set(H264Context *h){
} }


sps->ref_frame_count= get_ue_golomb(&s->gb); sps->ref_frame_count= get_ue_golomb(&s->gb);
if(sps->ref_frame_count > MAX_PICTURE_COUNT-2){
av_log(h->s.avctx, AV_LOG_ERROR, "too many reference frames\n");
}
sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb); sps->gaps_in_frame_num_allowed_flag= get_bits1(&s->gb);
sps->mb_width= get_ue_golomb(&s->gb) + 1; sps->mb_width= get_ue_golomb(&s->gb) + 1;
sps->mb_height= get_ue_golomb(&s->gb) + 1; sps->mb_height= get_ue_golomb(&s->gb) + 1;


+ 1
- 1
libavcodec/mpegvideo.h View File

@@ -50,7 +50,7 @@ enum OutputFormat {


#define MAX_THREADS 8 #define MAX_THREADS 8


#define MAX_PICTURE_COUNT 15
#define MAX_PICTURE_COUNT 32


#define ME_MAP_SIZE 64 #define ME_MAP_SIZE 64
#define ME_MAP_SHIFT 3 #define ME_MAP_SHIFT 3


Loading…
Cancel
Save