From d5063dcd21a99f53f7cceb4bbb491b8f8068f8b1 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 11 Jan 2006 15:31:24 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdec.c: Add exception for Indeo3 keyframe detection until upstream ffmpeg behaves properly. Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame): Add exception for Indeo3 keyframe detection until upstream ffmpeg behaves properly. --- ChangeLog | 6 ++++++ common | 2 +- ext/ffmpeg/gstffmpegdec.c | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5e92a5f1ca..01f79267bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-11 Edward Hervey + + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame): + Add exception for Indeo3 keyframe detection until upstream ffmpeg + behaves properly. + 2005-12-19 Edward Hervey * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps): diff --git a/common b/common index d1911d4b3d..e0b121388e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit d1911d4b3d6267f9cd9dfb68fcef2afe4d098092 +Subproject commit e0b121388ece524c0b7035a72bddd191d122d8bf diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index e4223fd657..b1b81d7aed 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -819,6 +819,7 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec, is_itype = (ffmpegdec->picture->pict_type == FF_I_TYPE); is_reference = (ffmpegdec->picture->reference == 1); iskeyframe = ( is_itype || is_reference ) + || (oclass->in_plugin->id == CODEC_ID_INDEO3) || (oclass->in_plugin->id == CODEC_ID_MSZH) || (oclass->in_plugin->id == CODEC_ID_ZLIB); GST_DEBUG_OBJECT (ffmpegdec,