From 94b1421fa2b1fccf9e161444c4a08fd537e8f7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 22 Jan 2008 11:10:57 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdemux.c: Don't register typefinders for which we have better replacements in base. Fixes bug #510... Original commit message from CVS: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): Don't register typefinders for which we have better replacements in base. Fixes bug #510985. --- ChangeLog | 6 ++++++ ext/ffmpeg/gstffmpegdemux.c | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f003d8e21d..680e6f55b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-22 Sebastian Dröge + + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): + Don't register typefinders for which we have better replacements + in base. Fixes bug #510985. + 2008-01-21 Wim Taymans * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_video_frame), diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index d7b6b260d2..747d127326 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -1537,7 +1537,17 @@ gst_ffmpegdemux_register (GstPlugin * plugin) !strcmp (in_plugin->name, "au") || !strcmp (in_plugin->name, "tta") || !strcmp (in_plugin->name, "rm") || - !strcmp (in_plugin->name, "amr") || !strcmp (in_plugin->name, "gif")) + !strcmp (in_plugin->name, "amr") || + !strcmp (in_plugin->name, "ogg") || + !strcmp (in_plugin->name, "aiff") || + !strcmp (in_plugin->name, "ape") || + !strcmp (in_plugin->name, "dv") || + !strcmp (in_plugin->name, "flv") || + !strcmp (in_plugin->name, "mpc") || + !strcmp (in_plugin->name, "mpegts") || + !strcmp (in_plugin->name, "nuv") || + !strcmp (in_plugin->name, "swf") || + !strcmp (in_plugin->name, "voc") || !strcmp (in_plugin->name, "gif")) register_typefind_func = FALSE; /* Set the rank of demuxers know to work to MARGINAL.