From a24ce03f75a819f664497ec03a83234418cbc579 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 25 May 2008 21:55:24 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdemux.c: Explicitly disable 'raw' mpeg-ts typefinder as well; better debug logging for the gst-ff... Original commit message from CVS: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find), (gst_ffmpegdemux_register): Explicitly disable 'raw' mpeg-ts typefinder as well; better debug logging for the gst-ffmpeg typefinders. (#533708). --- ChangeLog | 7 +++++++ ext/ffmpeg/gstffmpegdemux.c | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b7e859..b9e866e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2008-05-25 Tim-Philipp Müller + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find), + (gst_ffmpegdemux_register): + Explicitly disable 'raw' mpeg-ts typefinder as well; better debug logging + for the gst-ffmpeg typefinders. (#533708). + +2008-05-25 Tim-Philipp Müller + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_query_list), (gst_ffmpegdemux_src_query), (gst_ffmpegdemux_get_stream), (gst_ffmpegdemux_open): diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index 061d62a..4264259 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -1159,10 +1159,14 @@ gst_ffmpegdemux_type_find (GstTypeFind * tf, gpointer priv) res = MAX (1, res * GST_TYPE_FIND_MAXIMUM / AVPROBE_SCORE_MAX); /* Restrict the probability for MPEG-TS streams, because there is * probably a better version in plugins-base, if the user has a recent - * plugins-base */ - if (!strcmp (in_plugin->name, "mpegts")) + * plugins-base (in fact we shouldn't even get here for ffmpeg mpegts or + * mpegtsraw typefinders, since we blacklist them) */ + if (g_str_has_prefix (in_plugin->name, "mpegts")) res = MIN (res, GST_TYPE_FIND_POSSIBLE); + GST_LOG ("ffmpeg typefinder '%s' suggests %" GST_PTR_FORMAT ", p=%u%%", + in_plugin->name, params->sinkcaps, res); + gst_type_find_suggest (tf, res, params->sinkcaps); } } @@ -1569,6 +1573,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin) !strcmp (in_plugin->name, "mpc") || !strcmp (in_plugin->name, "mpc8") || !strcmp (in_plugin->name, "mpegts") || + !strcmp (in_plugin->name, "mpegtsraw") || !strcmp (in_plugin->name, "nuv") || !strcmp (in_plugin->name, "swf") || !strcmp (in_plugin->name, "voc") || !strcmp (in_plugin->name, "gif")) -- 2.7.4