[SCM] libav/experimental: Do not use the generic "alloc missing references" code for h.264 as it does not work correctly in that case. Fixes issue652.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:30:31 UTC 2013
The following commit has been merged in the experimental branch:
commit fe67a236dd97a20478f1b71d255e64d202287ecc
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Thu Sep 25 14:34:14 2008 +0000
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
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index ce52a0c..588bb78 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -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;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list