summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Smith <msmith@rdio.com>2012-09-12 10:18:53 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-11-19 14:39:58 +0100
commit185e92c14b7678dd6c53d126500dd07d6386d872 (patch)
treee46b9e2f9f70f8b425e2a2e00823980f3e15de26
parentb6d824c2d9e458f497d3cb16fd658baf1bddbe6d (diff)
qtdemux: add support for prores
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=683839
-rw-r--r--gst/isomp4/qtdemux.c4
-rw-r--r--gst/isomp4/qtdemux_fourcc.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index a8fb75fb2..a22a69006 100644
--- a/gst/isomp4/qtdemux.c
+++ b/gst/isomp4/qtdemux.c
@@ -9513,6 +9513,10 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
_codec ("On2 VP8");
caps = gst_caps_from_string ("video/x-vp8");
break;
+ case GST_MAKE_FOURCC ('a', 'p', 'c', 's'):
+ _codec ("Apple ProRes");
+ caps = gst_caps_from_string ("video/x-prores");
+ break;
case FOURCC_ovc1:
_codec ("VC-1");
caps = gst_caps_new_simple ("video/x-wmv",
diff --git a/gst/isomp4/qtdemux_fourcc.h b/gst/isomp4/qtdemux_fourcc.h
index f2a349291..716dfc98c 100644
--- a/gst/isomp4/qtdemux_fourcc.h
+++ b/gst/isomp4/qtdemux_fourcc.h
@@ -173,6 +173,7 @@ G_BEGIN_DECLS
#define FOURCC_tx3g GST_MAKE_FOURCC('t','x','3','g')
#define FOURCC_mp4s GST_MAKE_FOURCC('m','p','4','s')
#define FOURCC_gama GST_MAKE_FOURCC('g','a','m','a')
+#define FOURCC_apcs GST_MAKE_FOURCC('a','p','c','s')
/* SVQ3 fourcc */
#define FOURCC_SEQH GST_MAKE_FOURCC('S','E','Q','H')