comparison mpegvideo.c @ 4413:371bb9f644da libavcodec

fix inifnite loop with http://sam.zoy.org/zzuf/lol-mplayer.mpg
author michael
date Fri, 26 Jan 2007 15:26:08 +0000
parents daa2a095181d
children 1d273628b4cb
comparison
equal deleted inserted replaced
4412:cce4bdb0e322 4413:371bb9f644da
1601 s->pict_type, s->dropable);*/ 1601 s->pict_type, s->dropable);*/
1602 1602
1603 if(s->last_picture_ptr) copy_picture(&s->last_picture, s->last_picture_ptr); 1603 if(s->last_picture_ptr) copy_picture(&s->last_picture, s->last_picture_ptr);
1604 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr); 1604 if(s->next_picture_ptr) copy_picture(&s->next_picture, s->next_picture_ptr);
1605 1605
1606 if(s->pict_type != I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL)){ 1606 if(s->pict_type != I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL) && !s->dropable){
1607 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); 1607 av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n");
1608 assert(s->pict_type != B_TYPE); //these should have been dropped if we don't have a reference 1608 assert(s->pict_type != B_TYPE); //these should have been dropped if we don't have a reference
1609 goto alloc; 1609 goto alloc;
1610 } 1610 }
1611 1611