aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-01-26 15:26:08 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-01-26 15:26:08 +0000
commit1fdefd98817350d55b430fe52e9009ce3955993d (patch)
tree8aab852cb4b2c07d6333680dfe68ee8b6f2a1297
parentde6c4b2dd3ae9cd84f6217ff24e45b2fa8355632 (diff)
downloadffmpeg-1fdefd98817350d55b430fe52e9009ce3955993d.tar.gz
fix inifnite loop with http://sam.zoy.org/zzuf/lol-mplayer.mpg
Originally committed as revision 7718 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/mpegvideo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f23faedda3..2984b324d1 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -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;