Commit 4c30f877 authored by Michael Smith's avatar Michael Smith

ext/ffmpeg/gstffmpegdemux.c: One of the ffmpeg 'plugins' changed its name with...

ext/ffmpeg/gstffmpegdemux.c: One of the ffmpeg 'plugins' changed its name with the latest update of the snapshot. Cha...

Original commit message from CVS:
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
One of the ffmpeg 'plugins' changed its name with the latest update
of the snapshot. Change the blacklisted typefind list to match.
parent ec99371b
2006-06-02 Michael Smith <msmith@fluendo.com>
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
One of the ffmpeg 'plugins' changed its name with the latest update
of the snapshot. Change the blacklisted typefind list to match.
2006-06-02 Michael Smith <msmith@fluendo.com>
reviewed by: <delete if not using a buddy>
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):
* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_chain_video):
2006-05-26 Edward Hervey <edward@fluendo.com> 2006-05-26 Edward Hervey <edward@fluendo.com>
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
......
common @ 80b4e2c0
Subproject commit 764c5f25101d20da7f26942c36ba840ba65c63d7 Subproject commit 80b4e2c08717159760ebaa40715f8919b3f77ba9
...@@ -1389,7 +1389,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin) ...@@ -1389,7 +1389,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin)
rank = GST_RANK_NONE; rank = GST_RANK_NONE;
} }
if (!strcmp (in_plugin->name, "mov,mp4,m4a,3gp,3g2") || if (!strcmp (in_plugin->name, "mov,mp4,m4a,3gp,3g2,mj2") ||
!strcmp (in_plugin->name, "avi") || !strcmp (in_plugin->name, "avi") ||
!strcmp (in_plugin->name, "asf") || !strcmp (in_plugin->name, "asf") ||
!strcmp (in_plugin->name, "mpegvideo") || !strcmp (in_plugin->name, "mpegvideo") ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment