From 8800cd993d5ffc6d7790b0d52b4815259f5b6ee9 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 5 Mar 2004 02:40:34 +0000 Subject: [PATCH] ext/ffmpeg/gstffmpegcodecmap.c: Fix quicktime type recognition in ffmpeg. We returned a bogus caps, which caused ffde... Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps): Fix quicktime type recognition in ffmpeg. We returned a bogus caps, which caused ffdemux_quicktime to be chosen over qtdemux. This fixes that. --- ChangeLog | 7 +++++++ ext/ffmpeg/gstffmpegcodecmap.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 273e514..b079a8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2004-03-04 Ronald Bultje + * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_formatid_to_caps): + Fix quicktime type recognition in ffmpeg. We returned a bogus + caps, which caused ffdemux_quicktime to be chosen over qtdemux. + This fixes that. + +2004-03-04 Ronald Bultje + * configure.ac: Brackets cause autoconf errors. So remove them. * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_add): diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index 976201d..000c608 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -908,7 +908,7 @@ gst_ffmpeg_formatid_to_caps (const gchar *format_name) } else if (!strcmp (format_name, "au")) { caps = gst_caps_new_simple ("audio/x-au", NULL); - } else if (!strcmp (format_name, "mov")) { + } else if (!strcmp (format_name, "mov_mp4_m4a_3gp")) { caps = gst_caps_new_simple ("video/quicktime", NULL); } else if (!strcmp (format_name, "dv")) { @@ -918,6 +918,9 @@ gst_ffmpeg_formatid_to_caps (const gchar *format_name) } else if (!strcmp (format_name, "4xm")) { caps = gst_caps_new_simple ("video/x-4xm", NULL); + } else if (!strcmp (format_name, "matroska")) { + caps = gst_caps_new_simple ("video/x-matroska", + NULL); } else { gchar *name; -- 2.7.4