Commit 5cbb0e70 authored by Michael Niedermayer's avatar Michael Niedermayer

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
parent 15c5fa7b
......@@ -5430,6 +5430,9 @@ static inline int decode_seq_parameter_set(H264Context *h){
}
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->mb_width= get_ue_golomb(&s->gb) + 1;
sps->mb_height= get_ue_golomb(&s->gb) + 1;
......
......@@ -50,7 +50,7 @@ enum OutputFormat {
#define MAX_THREADS 8
#define MAX_PICTURE_COUNT 15
#define MAX_PICTURE_COUNT 32
#define ME_MAP_SIZE 64
#define ME_MAP_SHIFT 3
......
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