Commit 8800cd99 authored by Ronald S. Bultje's avatar Ronald S. Bultje

ext/ffmpeg/gstffmpegcodecmap.c: Fix quicktime type recognition in ffmpeg. We...

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.
parent c9b89b2f
2004-03-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* 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 <rbultje@ronald.bitfreak.net>
* configure.ac:
......
......@@ -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;
......
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