From 1abaeb885cbc13fb194a02118c4d2bed5319afa4 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Tue, 2 Mar 2004 02:30:04 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdec.c: Fix B-frame DivX5/XviD display by removing the truncated flag when not needed. Original commit message from CVS: * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect): Fix B-frame DivX5/XviD display by removing the truncated flag when not needed. * gst-libs/ext/ffmpeg/patch/autotools.diff: Remove link to libavcodec - it causes symbol conflicts (why?). --- ChangeLog | 8 ++++++++ ext/ffmpeg/gstffmpegdec.c | 7 +++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a4373019a..f7760e88a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-03-01 Ronald Bultje + + * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_connect): + Fix B-frame DivX5/XviD display by removing the truncated flag when + not needed. + * gst-libs/ext/ffmpeg/patch/autotools.diff: + Remove link to libavcodec - it causes symbol conflicts (why?). + 2004-02-29 Ronald Bultje * HACKING: diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c index d729de22cd..8a0b619632 100644 --- a/ext/ffmpeg/gstffmpegdec.c +++ b/ext/ffmpeg/gstffmpegdec.c @@ -235,8 +235,11 @@ gst_ffmpegdec_connect (GstPad *pad, gst_ffmpeg_caps_to_codectype (oclass->in_plugin->type, caps, ffmpegdec->context); - /* we dont send complete frames */ - if (oclass->in_plugin->capabilities & CODEC_CAP_TRUNCATED) + /* we dont send complete frames - FIXME: we need a 'framed' property + * in caps */ + if (oclass->in_plugin->capabilities & CODEC_CAP_TRUNCATED && + (ffmpegdec->context->codec_id == CODEC_ID_MPEG1VIDEO || + ffmpegdec->context->codec_id == CODEC_ID_MPEG2VIDEO)) ffmpegdec->context->flags |= CODEC_FLAG_TRUNCATED; /* do *not* draw edges */