From 4c30f877060fa0de1a8b6ec4dc9ddc49c5a22c9e Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Fri, 2 Jun 2006 11:50:45 +0000 Subject: [PATCH] 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. --- ChangeLog | 13 +++++++++++++ common | 2 +- ext/ffmpeg/gstffmpegdemux.c | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07a6c3968d..4bdc339035 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-06-02 Michael Smith + + * 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 + + reviewed by: + + * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): + * ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_chain_video): + 2006-05-26 Edward Hervey * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps), diff --git a/common b/common index 764c5f2510..80b4e2c087 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 764c5f25101d20da7f26942c36ba840ba65c63d7 +Subproject commit 80b4e2c08717159760ebaa40715f8919b3f77ba9 diff --git a/ext/ffmpeg/gstffmpegdemux.c b/ext/ffmpeg/gstffmpegdemux.c index 5fdfd087ba..d44506c34d 100644 --- a/ext/ffmpeg/gstffmpegdemux.c +++ b/ext/ffmpeg/gstffmpegdemux.c @@ -1389,7 +1389,7 @@ gst_ffmpegdemux_register (GstPlugin * plugin) 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, "asf") || !strcmp (in_plugin->name, "mpegvideo") ||