mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-28 05:50:43 +00:00
fix inifnite loop with http://sam.zoy.org/zzuf/lol-mplayer.mpg
Originally committed as revision 7718 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
de6c4b2dd3
commit
1fdefd9881
@ -1603,7 +1603,7 @@ alloc:
|
||||
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->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");
|
||||
assert(s->pict_type != B_TYPE); //these should have been dropped if we don't have a reference
|
||||
goto alloc;
|
||||
|
Loading…
Reference in New Issue
Block a user