summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2006-12-07 11:35:41 +0000
committerWim Taymans <wim.taymans@gmail.com>2006-12-07 11:35:41 +0000
commit499eaaf9c1afb78886bc3563db21bc9d3bd0f16b (patch)
treee3d98a247f2a6e7407b7df3d39d3ff724b4e6e18
parent8ea43a2434fface153773d8d1777a2d0d3117db9 (diff)
downloadgst-plugins-bad-499eaaf9c1afb78886bc3563db21bc9d3bd0f16b.tar.gz
gst-plugins-bad-499eaaf9c1afb78886bc3563db21bc9d3bd0f16b.tar.bz2
gst-plugins-bad-499eaaf9c1afb78886bc3563db21bc9d3bd0f16b.zip
gst/qtdemux/qtdemux.c: Handle more H263 variants.
Original commit message from CVS: * gst/qtdemux/qtdemux.c: (gst_qtdemux_get_duration), (gst_qtdemux_handle_src_query), (qtdemux_parse_trak), (qtdemux_video_caps): Handle more H263 variants.
-rw-r--r--ChangeLog7
-rw-r--r--gst/qtdemux/qtdemux.c2
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 94aee819..9ae7d3f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-07 Wim Taymans <wim@fluendo.com>
+
+ * gst/qtdemux/qtdemux.c: (gst_qtdemux_get_duration),
+ (gst_qtdemux_handle_src_query), (qtdemux_parse_trak),
+ (qtdemux_video_caps):
+ Handle more H263 variants.
+
2006-12-06 Jan Schmidt <thaytan@mad.scientist.com>
* ext/jack/.cvsignore:
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index e174fd95..88235be2 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -4358,7 +4358,9 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc,
_codec ("GIF still images");
return gst_caps_from_string ("image/gif");
case GST_MAKE_FOURCC ('h', '2', '6', '3'):
+ case GST_MAKE_FOURCC ('H', '2', '6', '3'):
case GST_MAKE_FOURCC ('s', '2', '6', '3'):
+ case GST_MAKE_FOURCC ('U', '2', '6', '3'):
_codec ("H.263");
/* ffmpeg uses the height/width props, don't know why */
return gst_caps_from_string ("video/x-h263");