1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

Fixes a segfault when flushing delayed B-frames on the 2nd pass. patch by (Loren Merritt <lorenm.u@washington@edu>)

Originally committed as revision 3707 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Loren Merritt 2004-11-23 23:58:54 +00:00 committed by Michael Niedermayer
parent 7e0fda0a4e
commit 80516d720a

View File

@ -2015,6 +2015,12 @@ static void select_input_picture(MpegEncContext *s){
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; int pict_type= s->rc_context.entry[pict_num].new_pict_type;
if(!s->input_picture[i]){
if(i>0)
s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE;
break;
}
s->input_picture[i]->pict_type= pict_type; s->input_picture[i]->pict_type= pict_type;
if(i + 1 >= s->rc_context.num_entries) break; if(i + 1 >= s->rc_context.num_entries) break;