blacklist bogus demuxer/muxer/typefind. Fixes #567336 and #574814

2 files changed, 21 insertions, 3 deletions

diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index ae0caf6..bd3ed2b 100644
--- a/ext/ffmpeg/gstffmpegdemux.c
+++ b/ext/ffmpeg/gstffmpegdemux.c
@@ -1806,7 +1806,19 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
         !strncmp (in_plugin->name, "image", 5) ||
         !strcmp (in_plugin->name, "mpegvideo") ||
         !strcmp (in_plugin->name, "mjpeg") ||
-        !strcmp (in_plugin->name, "redir"))
+        !strcmp (in_plugin->name, "redir") ||
+        !strncmp (in_plugin->name, "u8", 2) ||
+        !strncmp (in_plugin->name, "u16", 3) ||
+        !strncmp (in_plugin->name, "u24", 3) ||
+        !strncmp (in_plugin->name, "u32", 3) ||
+        !strncmp (in_plugin->name, "s8", 2) ||
+        !strncmp (in_plugin->name, "s16", 3) ||
+        !strncmp (in_plugin->name, "s24", 3) ||
+        !strncmp (in_plugin->name, "s32", 3) ||
+        !strncmp (in_plugin->name, "f32", 3) ||
+        !strncmp (in_plugin->name, "f64", 3) ||
+        !strcmp (in_plugin->name, "mulaw") || !strcmp (in_plugin->name, "alaw")
+        )
       goto next;
 
     /* no network demuxers */
@@ -1845,7 +1857,9 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
         !strcmp (in_plugin->name, "mxf") ||
         !strcmp (in_plugin->name, "nuv") ||
         !strcmp (in_plugin->name, "swf") ||
-        !strcmp (in_plugin->name, "voc") || !strcmp (in_plugin->name, "gif"))
+        !strcmp (in_plugin->name, "voc") ||
+        !strcmp (in_plugin->name, "gif") || !strcmp (in_plugin->name, "vc1test")
+        )
       register_typefind_func = FALSE;
 
     /* Set the rank of demuxers know to work to MARGINAL.
diff --git a/ext/ffmpeg/gstffmpegmux.c b/ext/ffmpeg/gstffmpegmux.c
index 9b8ce73..fe16c0a 100644
--- a/ext/ffmpeg/gstffmpegmux.c
+++ b/ext/ffmpeg/gstffmpegmux.c
@@ -792,7 +792,11 @@ gst_ffmpegmux_register (GstPlugin * plugin)
         (!strncmp (in_plugin->name, "null", 4)) ||
         (!strncmp (in_plugin->name, "gif", 3)) ||
         (!strncmp (in_plugin->name, "frame", 5)) ||
-        (!strncmp (in_plugin->name, "image", 5))
+        (!strncmp (in_plugin->name, "image", 5)) ||
+        (!strncmp (in_plugin->name, "mulaw", 5)) ||
+        (!strncmp (in_plugin->name, "alaw", 4)) ||
+        (!strncmp (in_plugin->name, "h26", 3)) ||
+        (!strncmp (in_plugin->name, "amr", 3))
         ) {
       GST_LOG ("Ignoring muxer %s", in_plugin->name);
       goto next;