mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/gstffmpegdemux.c: Explicitly disable 'raw' mpeg-ts typefinder as well; better debug logging for the gst-ff...

Browse source 
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).
This commit is contained in:
Tim-Philipp Müller 2008-05-25 21:55:24 +00:00
parent b7e4ff666a
commit a24ce03f75
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-05-25 Tim-Philipp Müller <tim.muller at collabora co uk>
* 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 <tim.muller at collabora co uk> 2008-05-25 Tim-Philipp Müller <tim.muller at collabora co uk>
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_query_list), * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_src_query_list),

9
ext/ffmpeg/gstffmpegdemux.c
View file

@ -1159,10 +1159,14 @@ gst_ffmpegdemux_type_find (GstTypeFind * tf, gpointer priv)
res = MAX (1, res * GST_TYPE_FIND_MAXIMUM / AVPROBE_SCORE_MAX); res = MAX (1, res * GST_TYPE_FIND_MAXIMUM / AVPROBE_SCORE_MAX);
/* Restrict the probability for MPEG-TS streams, because there is /* Restrict the probability for MPEG-TS streams, because there is
* probably a better version in plugins-base, if the user has a recent * probably a better version in plugins-base, if the user has a recent
* plugins-base */ * plugins-base (in fact we shouldn't even get here for ffmpeg mpegts or
if (!strcmp (in_plugin->name, "mpegts")) * mpegtsraw typefinders, since we blacklist them) */
if (g_str_has_prefix (in_plugin->name, "mpegts"))
res = MIN (res, GST_TYPE_FIND_POSSIBLE); 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); 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, "mpc") ||
!strcmp (in_plugin->name, "mpc8") || !strcmp (in_plugin->name, "mpc8") ||
!strcmp (in_plugin->name, "mpegts") || !strcmp (in_plugin->name, "mpegts") ||
!strcmp (in_plugin->name, "mpegtsraw") ||
!strcmp (in_plugin->name, "nuv") || !strcmp (in_plugin->name, "nuv") ||
!strcmp (in_plugin->name, "swf") || !strcmp (in_plugin->name, "swf") ||
!strcmp (in_plugin->name, "voc") || !strcmp (in_plugin->name, "gif")) !strcmp (in_plugin->name, "voc") || !strcmp (in_plugin->name, "gif"))