virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-17 20:17:55 +02:00
Code Issues Releases Activity

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

Browse Source 
Originally committed as revision 3504 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-09-25 09:59:36 +00:00
parent 15c5fa7b7f
commit 5cbb0e70a0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
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;

2
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