From 0932c8c3344f5af6e8b8f1adeaa828f924e60391 Mon Sep 17 00:00:00 2001
From: Edward Hervey <bilboed@bilboed.com>
Date: Mon, 9 Oct 2006 10:10:54 +0000
Subject: [PATCH] ext/ffmpeg/gstffmpegdemux.c: Set the rank of all demuxers for
 which we: _ Have no alternate demuxer, _ And are know n...

Original commit message from CVS:
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
Set the rank of all demuxers for which we:
_ Have no alternate demuxer,
_ And are know not to crash like madmans,
to GST_RANK_MARGINAL
---
 ChangeLog                   |  8 ++++++++
 common                      |  2 +-
 ext/ffmpeg/gstffmpegdemux.c | 30 +++++++++++++++++++++++++++++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 452fcddcb4..7ac3a59989 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-09  Edward Hervey  <edward@fluendo.com>
+
+	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
+	Set the rank of all demuxers for which we:
+	_ Have no alternate demuxer,
+	_ And are know not to crash like madmans,
+	to GST_RANK_MARGINAL
+
 2006-10-09  Edward Hervey  <edward@fluendo.com>
 
 	* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
diff --git a/common b/common
index 83b08805d0..efcacf2625 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 83b08805d0c109b6dbdcfca0a8b9659b1c556480
+Subproject commit efcacf2625da231fbee99b68e0f5db6816cf6fad
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index 6966fd20e7..3436506d25 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1433,7 +1433,35 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
     /* Set the rank of demuxers know to work to MARGINAL.
      * Set demuxers for which we already have another implementation to NONE
      * Set All others to NONE*/
-    if (!strcmp (in_plugin->name, "flv"))
+    if (!strcmp (in_plugin->name, "flv") ||
+	!strcmp (in_plugin->name, "wsvqa") ||
+	!strcmp (in_plugin->name, "wsaud") ||
+	!strcmp (in_plugin->name, "wc3movie") ||
+	!strcmp (in_plugin->name, "voc") ||
+	!strcmp (in_plugin->name, "tta") ||
+	!strcmp (in_plugin->name, "swf") ||
+	!strcmp (in_plugin->name, "sol") ||
+	!strcmp (in_plugin->name, "smk") ||
+	!strcmp (in_plugin->name, "vmd") ||
+	!strcmp (in_plugin->name, "film_cpk") ||
+	!strcmp (in_plugin->name, "ingenient") ||
+	!strcmp (in_plugin->name, "psxstr") ||
+	!strcmp (in_plugin->name, "nuv") ||
+	!strcmp (in_plugin->name, "nut") ||
+	!strcmp (in_plugin->name, "nsv") ||
+	!strcmp (in_plugin->name, "mxf") ||
+	!strcmp (in_plugin->name, "mmf") ||
+	!strcmp (in_plugin->name, "mm") ||
+	!strcmp (in_plugin->name, "ipmovie") ||
+	!strcmp (in_plugin->name, "RoQ") ||
+	!strcmp (in_plugin->name, "idcin") ||
+	!strcmp (in_plugin->name, "gxf") ||
+	!strcmp (in_plugin->name, "ffm") ||
+	!strcmp (in_plugin->name, "ea") ||
+	!strcmp (in_plugin->name, "daud") ||
+	!strcmp (in_plugin->name, "avs") ||
+	!strcmp (in_plugin->name, "aiff") ||
+	!strcmp (in_plugin->name, "4xm"))
       rank = GST_RANK_MARGINAL;
     else
       rank = GST_RANK_NONE;