From a23a6a9d2a1f87ac82c88c29488f3541f109c746 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 21 May 2007 11:04:11 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegdemux.c: Reduce the probability of the MPEG-TS typefinder, because there's a better one in recent... Original commit message from CVS: * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find): Reduce the probability of the MPEG-TS typefinder, because there's a better one in recent base releases. --- ChangeLog | 6 ++++++ ext/ffmpeg/gstffmpegdemux.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 26df2c154f..6d20c959e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-05-21 Jan Schmidt + + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_type_find): + Reduce the probability of the MPEG-TS typefinder, because there's a + better one in recent base releases. + 2007-05-17 Edward Hervey * configure.ac: diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index c85f9c073f..297ae13633 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -1132,6 +1132,12 @@ gst_ffmpegdemux_type_find (GstTypeFind * tf, gpointer priv) res = in_plugin->read_probe (&probe_data); if (res > 0) { 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")) + res = MIN (res, GST_TYPE_FIND_POSSIBLE); + gst_type_find_suggest (tf, res, params->sinkcaps); } }