r15413 - trunk/libavcodec/mpegvideo.c
Author: michael Date: Thu Sep 25 16:34:14 2008 New Revision: 15413 Log: Do not use the generic "alloc missing references" code for h.264 as it does not work correctly in that case. Fixes issue652. Modified: trunk/libavcodec/mpegvideo.c Modified: trunk/libavcodec/mpegvideo.c ============================================================================== --- trunk/libavcodec/mpegvideo.c (original) +++ trunk/libavcodec/mpegvideo.c Thu Sep 25 16:34:14 2008 @@ -894,7 +894,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 != FF_I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL) && !s->dropable){ + if(s->pict_type != FF_I_TYPE && (s->last_picture_ptr==NULL || s->last_picture_ptr->data[0]==NULL) && !s->dropable && s->codec_id != CODEC_ID_H264){ av_log(avctx, AV_LOG_ERROR, "warning: first frame is no keyframe\n"); assert(s->pict_type != FF_B_TYPE); //these should have been dropped if we don't have a reference goto alloc;
participants (1)
-
subversion@mplayerhq.hu