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/gstffmpegcodecmap.c: Fix quicktime type recognition in ffmpeg. We returned a bogus caps, which caused ffde...

Browse source 
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.
This commit is contained in:
Ronald S. Bultje 2004-03-05 02:40:34 +00:00
parent c9b89b2fec
commit 8800cd993d
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
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> 2004-03-04 Ronald Bultje <rbultje@ronald.bitfreak.net>
* configure.ac: * configure.ac:

5
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -908,7 +908,7 @@ gst_ffmpeg_formatid_to_caps (const gchar *format_name)
} else if (!strcmp (format_name, "au")) { } else if (!strcmp (format_name, "au")) {
caps = gst_caps_new_simple ("audio/x-au", caps = gst_caps_new_simple ("audio/x-au",
NULL); NULL);
} else if (!strcmp (format_name, "mov")) { } else if (!strcmp (format_name, "mov_mp4_m4a_3gp")) {
caps = gst_caps_new_simple ("video/quicktime", caps = gst_caps_new_simple ("video/quicktime",
NULL); NULL);
} else if (!strcmp (format_name, "dv")) { } 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")) { } else if (!strcmp (format_name, "4xm")) {
caps = gst_caps_new_simple ("video/x-4xm", caps = gst_caps_new_simple ("video/x-4xm",
NULL); NULL);
} else if (!strcmp (format_name, "matroska")) {
caps = gst_caps_new_simple ("video/x-matroska",
NULL);
} else { } else {
gchar *name; gchar *name;