[Ffmpeg-cvslog] r7718 - trunk/libavcodec/mpegvideo.c

[michael]

Author: michael
Date: Fri Jan 26 16:26:08 2007
New Revision: 7718

Modified:
   trunk/libavcodec/mpegvideo.c

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


Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	(original)
+++ trunk/libavcodec/mpegvideo.c	Fri Jan 26 16:26:08 2007
@@ -1603,7 +1603,7 @@
     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;