set rank None for mp3 and mpeg2 element, fixes 162833

Original commit message from CVS:
set rank None for mp3 and mpeg2 element, fixes 162833

diff --git a/ChangeLog b/ChangeLog
index 313f103..7aba045 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-02  Christian Schaller <christian at fluendo dot com>
+
+       * Set rank NONE for mp3 and mpeg2video:
+         They don't work properly and having them autoplugged
+         gives people a bad impression and leads them to not grab 
+         mad or fluendo mp3. Fixes #162833
+
 2006-01-31  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * configure.ac:

diff --git a/common b/common
index 0b93085..1140eab 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 0b93085188e83fe678ec5ded2823cd7c24dfa843
+Subproject commit 1140eabed84dd1d8d6df7df88f5c8bdf20a8faa1

diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 2c10932..35a6eda 100644 (file)
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -214,7 +214,7 @@ gst_ffmpegdec_base_init (GstFFMpegDecClass * klass)
       (params->in_plugin->type == CODEC_TYPE_VIDEO) ? "Video" : "Audio");
   details.description = g_strdup_printf ("FFMPEG %s decoder",
       params->in_plugin->name);
-  details.author = "Wim Taymans <wim.taymans@chello.be>, "
+  details.author = "Wim Taymans <wim@fluendo.com>, "
       "Ronald Bultje <rbultje@ronald.bitfreak.net>";
   gst_element_class_set_details (element_class, &details);
   g_free (details.longname);
@@ -1387,6 +1387,13 @@ gst_ffmpegdec_register (GstPlugin * plugin)
         /* what's that? */
       case CODEC_ID_SP5X:
         rank = GST_RANK_NONE;
+        /* MP3 and MPEG2 have better alternatives and
+           the ffmpeg versions don't work properly feel
+           free to assign rank if you fix them */
+      case CODEC_ID_MP3:
+       rank = GST_RANK_NONE;
+      case CODEC_ID_MPEG2VIDEO:
+       rank = GST_RANK_NONE;
         break;
     }
     if (!gst_element_register (plugin, type_name, rank, type)) {