ext/ffmpeg/Makefile.am: Prevent more symbol conflicts...

Original commit message from CVS:
* ext/ffmpeg/Makefile.am:
Prevent more symbol conflicts...
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
Up priority/rank for MPEG-4 decoder. Reason is simple: it's well-
tested and by far outperforms xviddec/divxdec. They'll get some
other, slightly lower, rank.
* gst-libs/ext/ffmpeg/patch/autotools.diff:
Tweaking...
* gst-libs/ext/ffmpeg/patch/disableinstalllibs.diff:
Prevent more symbol conflicts. I changed this (to pass 'make
distcheck') in the one patch, so need to change it here too.
* gst-libs/ext/ffmpeg/patch/disablemmx.diff:
Re-enable MMX. :).
* gst-libs/ext/ffmpeg/patch/functions.diff:
Bla.

diff --git a/ChangeLog b/ChangeLog
index 4e8f297..9ec31dc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
 2004-03-09  Ronald Bultje  <rbultje@ronald.bitfreak.net>
 
+       * ext/ffmpeg/Makefile.am:
+         Prevent more symbol conflicts...
+       * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
+         Up priority/rank for MPEG-4 decoder. Reason is simple: it's well-
+         tested and by far outperforms xviddec/divxdec. They'll get some
+         other, slightly lower, rank.
+       * gst-libs/ext/ffmpeg/patch/autotools.diff:
+         Tweaking...
+       * gst-libs/ext/ffmpeg/patch/disableinstalllibs.diff:
+         Prevent more symbol conflicts. I changed this (to pass 'make
+         distcheck') in the one patch, so need to change it here too.
+       * gst-libs/ext/ffmpeg/patch/disablemmx.diff:
+         Re-enable MMX. :).
+       * gst-libs/ext/ffmpeg/patch/functions.diff:
+         Bla.
+
+2004-03-09  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
        * configure.ac:
          Patch properly. Update version.
        * gst-libs/ext/ffmpeg/Makefile.am:

diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am
index 2964be8..90bb40d 100644 (file)
--- a/ext/ffmpeg/Makefile.am
+++ b/ext/ffmpeg/Makefile.am
@@ -14,8 +14,8 @@ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) \
        -I $(top_srcdir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec \
        -I $(top_srcdir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat
 libgstffmpeg_la_LIBADD = \
-       $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.la \
-       $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat/libavformat.la
+       $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat/libavformat.la \
+       $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.la
 
 libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 

diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 8a0b619..77a5817 100644 (file)
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -520,9 +520,13 @@ gst_ffmpegdec_register (GstPlugin *plugin)
                         GINT_TO_POINTER (0), 
                         (gpointer) params);
     
-    /* create the gtype now */
+    /* create the gtype now
+     * (Ronald) MPEG-4 gets a higher priority because it has been well-
+     * tested and by far outperforms divxdec/xviddec - so we prefer it. */
     type = g_type_register_static(GST_TYPE_ELEMENT, type_name , &typeinfo, 0);
-    if (!gst_element_register (plugin, type_name, GST_RANK_MARGINAL, type)) {
+    if (!gst_element_register (plugin, type_name,
+                              (in_plugin->id == CODEC_ID_MPEG4) ?
+                              GST_RANK_PRIMARY : GST_RANK_MARGINAL, type)) {
       g_free (type_name);
       return FALSE;
     }