summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2007-05-21 11:04:11 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2007-05-21 11:04:11 +0000
commita23a6a9d2a1f87ac82c88c29488f3541f109c746 (patch)
treeeece3a56ef1e77d619d8f3af60a5766da27a9dcb
parentbdadc136b218260c86e104495218a3688cd1429d (diff)
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.
-rw-r--r--ChangeLog6
-rw-r--r--ext/ffmpeg/gstffmpegdemux.c6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 26df2c1..6d20c95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-21 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * 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 <edward@fluendo.com>
* configure.ac:
diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c
index c85f9c0..297ae13 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);
}
}