Commit 1fdefd98 authored by Michael Niedermayer's avatar Michael Niedermayer

fix inifnite loop with http://sam.zoy.org/zzuf/lol-mplayer.mpg

Originally committed as revision 7718 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent de6c4b2d
...@@ -1603,7 +1603,7 @@ alloc: ...@@ -1603,7 +1603,7 @@ alloc:
if(s->last_picture_ptr) copy_picture(&s->last_picture, s->last_picture_ptr); if(s->last_picture_ptr) copy_picture(&s->last_picture, s->last_picture_ptr);
if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr);
if(s->pict_type != I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL)){ if(s->pict_type != I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL) && !s->dropable){
av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n");
assert(s->pict_type != B_TYPE); //these should have been dropped if we don't have a reference assert(s->pict_type != B_TYPE); //these should have been dropped if we don't have a reference
goto alloc; goto alloc;
......
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