summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Smith <msmith@rdio.com>2012-09-12 10:25:24 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-11-19 10:17:48 +0100
commit6e3b03264ceabbedde5f4276ef6e052a73602ed5 (patch)
tree793fd545e5745b7d1e8364b2d1fe029a77f65226
parentbf04f8b1d23d4fa9bcca90b67969f119eb62440f (diff)
libav: add decode support for prores
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=683840 Conflicts: ext/ffmpeg/gstffmpegcodecmap.c
-rw-r--r--ext/ffmpeg/gstffmpegcodecmap.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index db13f5d..64a328b 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -1200,6 +1200,12 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-dnxhd", NULL);
break;
+ case CODEC_ID_PRORES:
+ caps =
+ gst_ff_vid_caps_new (context, codec_id, encode, "video/x-prores",
+ NULL);
+ break;
+
case CODEC_ID_MIMIC:
caps = gst_ff_vid_caps_new (context, codec_id, "video/x-mimic", NULL);
break;