summaryrefslogtreecommitdiff
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorTomas Härdin <tomas.hardin@codemill.se>2011-02-03 10:50:50 +0100
committerMans Rullgard <mans@mansr.com>2011-02-03 11:40:56 +0000
commite65b1934bf4f2fbde611b75ea6c0c871daaf0b56 (patch)
tree5b23803f3df4872e1ec3dbeb309e041f67d68a6b /libavformat/isom.c
parent75fd0668df64c4b7140be5ac829dee4e327a3e57 (diff)
downloadffmpeg-e65b1934bf4f2fbde611b75ea6c0c871daaf0b56.tar.gz
Add ProRes FOURCCs to isom.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 71a97b37fc..89b352c75d 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -195,6 +195,12 @@ const AVCodecTag codec_movvideo_tags[] = {
{ CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */
{ CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */
+ { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */
+ { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */
+ { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */
+ { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
+ { CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
+
{ CODEC_ID_NONE, 0 },
};