Browse Source

Do not use the generic "alloc missing references" code for h.264 as it does

not work correctly in that case.
Fixes issue652.

Originally committed as revision 15413 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Michael Niedermayer 16 years ago
parent
commit
fe67a236dd
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/mpegvideo.c

+ 1
- 1
libavcodec/mpegvideo.c View File

@@ -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;


Loading…
Cancel
Save