ext/ffmpeg/gstffmpegdec.c: Fix B-frame DivX5/XviD display by removing the truncated...

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?).

diff --git a/ChangeLog b/ChangeLog
index 4a43730..f7760e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-01  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+       * 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  <rbultje@ronald.bitfreak.net>
 
        * HACKING:

diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index d729de2..8a0b619 100644 (file)
--- 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 */