Commit 9022797b authored by Michael Niedermayer's avatar Michael Niedermayer

fixing NULL reference frame with dr1

Originally committed as revision 775 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9ac7ecd6
...@@ -637,6 +637,12 @@ void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) ...@@ -637,6 +637,12 @@ void MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
for(i=0;i<3;i++) { for(i=0;i<3;i++) {
if(avctx->flags&CODEC_FLAG_DR1) if(avctx->flags&CODEC_FLAG_DR1)
s->aux_picture[i]= avctx->dr_buffer[i]; s->aux_picture[i]= avctx->dr_buffer[i];
//FIXME the following should never be needed, the decoder should drop b frames if no reference is available
if(s->next_picture[i]==NULL)
s->next_picture[i]= s->aux_picture[i];
if(s->last_picture[i]==NULL)
s->last_picture[i]= s->next_picture[i];
s->current_picture[i] = s->aux_picture[i]; s->current_picture[i] = s->aux_picture[i];
} }
......
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