summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Matthew <notverysmart@gmail.com>2008-09-14 11:32:15 +0000
committerEdward Hervey <bilboed@bilboed.com>2008-09-14 11:32:15 +0000
commit50eed1907b957d3a1e449e410941ce554af58bda (patch)
treebf73ac2635d82d3df4a9b865322e830069814335
parent2a4c9ec6aadb19df6fb0a391e74bd7160130f4df (diff)
downloadgstreamer-plugins-good-50eed1907b957d3a1e449e410941ce554af58bda.tar.gz
gst/qtdemux/qtdemux.c: Add mapping for 'tiff' => image/tiff
Original commit message from CVS: Patch by: Jonathan Matthew <notverysmart@gmail.com> * gst/qtdemux/qtdemux.c: (qtdemux_video_caps): Add mapping for 'tiff' => image/tiff Fixes #552213
-rw-r--r--ChangeLog7
-rw-r--r--gst/qtdemux/qtdemux.c4
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index dfd5e8bf6..33dec6621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-14 Edward Hervey <edward.hervey@collabora.co.uk>
+
+ Patch by: Jonathan Matthew <notverysmart@gmail.com>
+ * gst/qtdemux/qtdemux.c: (qtdemux_video_caps):
+ Add mapping for 'tiff' => image/tiff
+ Fixes #552213
+
2008-09-11 Tim-Philipp Müller <tim.muller at collabora co uk>
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index cb4355356..63ba038ed 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -4750,6 +4750,10 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
_codec ("Dirac");
caps = gst_caps_from_string ("video/x-dirac");
break;
+ case GST_MAKE_FOURCC ('t', 'i', 'f', 'f'):
+ _codec ("TIFF still images");
+ caps = gst_caps_from_string ("image/tiff");
+ break;
case GST_MAKE_FOURCC ('k', 'p', 'c', 'd'):
default:
{