generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there

Browse Source 
Originally committed as revision 3708 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2004-11-24 00:15:49 +00:00
parent 80516d720a
commit 6db2583c4f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/mpegvideo.c
View File

@ -2014,16 +2014,16 @@ static void select_input_picture(MpegEncContext *s){
if(s->flags&CODEC_FLAG_PASS2){ if(s->flags&CODEC_FLAG_PASS2){
for(i=0; i<s->max_b_frames+1; i++){ for(i=0; i<s->max_b_frames+1; i++){
int pict_num= s->input_picture[0]->display_picture_number + i; int pict_num= s->input_picture[0]->display_picture_number + i;
int pict_type= s->rc_context.entry[pict_num].new_pict_type;
if(pict_num >= s->rc_context.num_entries)
break;
if(!s->input_picture[i]){ if(!s->input_picture[i]){
if(i>0) s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE;
s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE;
break; break;
} }
s->input_picture[i]->pict_type= pict_type;
s->input_picture[i]->pict_type=
if(i + 1 >= s->rc_context.num_entries) break; s->rc_context.entry[pict_num].new_pict_type;
} }
} }