From e4ae049ab6dfe679fee72d4c177c287d25475abb Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 2 May 2006 13:53:57 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdemux.c: Give ffmpeg demuxers a rank of NONE for the time being, so that they are not auto-plugge... Original commit message from CVS: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): Give ffmpeg demuxers a rank of NONE for the time being, so that they are not auto-plugged; they are not stable enough for that yet (e.g. #337785). Don't register AAC demuxer, it's not really useful and can't be used as faad replacement (#338928). --- ChangeLog | 8 ++++++++ common | 2 +- ext/ffmpeg/gstffmpegdemux.c | 7 ++++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index edc0208..a65f806 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-05-02 Tim-Philipp Müller + + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): + Give ffmpeg demuxers a rank of NONE for the time being, so that + they are not auto-plugged; they are not stable enough for that + yet (e.g. #337785). Don't register AAC demuxer, it's not really + useful and can't be used as faad replacement (#338928). + 2006-04-24 Edgard Lima * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_chain_video): diff --git a/common b/common index a6710e6..6b67aa6 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a6710e67fd82147e32a18f1b63177583faffd498 +Subproject commit 6b67aa6dd111fb139e1be0f6a386e3ff84cce091 diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index 93a8340..5fdfd08 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -1365,7 +1365,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin) gchar *type_name, *typefind_name; gchar *p, *name = NULL; GstCaps *sinkcaps, *audiosrccaps, *videosrccaps; - gint rank = GST_RANK_MARGINAL; + gint rank = GST_RANK_NONE; /* don't autoplug unless more stable */ gboolean register_typefind_func = TRUE; /* no emulators */ @@ -1377,6 +1377,11 @@ gst_ffmpegdemux_register (GstPlugin * plugin) !strcmp (in_plugin->name, "mjpeg")) goto next; + /* these don't do what one would expect or + * are only partially functional/useful */ + if (!strcmp (in_plugin->name, "aac")) + goto next; + /* these are known to be buggy or broken or not * tested enough to let them be autoplugged */ if (!strcmp (in_plugin->name, "mp3") || /* = application/x-id3 */ -- 2.7.4