diff options
| author | Tomas Härdin <tomas.hardin@codemill.se> | 2011-02-03 10:50:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-04 03:10:11 +0100 |
| commit | b9dab1131c7bf3c5093fb9ce475b3b92480d7669 (patch) | |
| tree | 253dd6be557ae005ab78e72d51e11eec36e81178 /libavformat/isom.c | |
| parent | e3bf3d533d0285cf3c7b64240fd6f39d91958045 (diff) | |
| download | ffmpeg-b9dab1131c7bf3c5093fb9ce475b3b92480d7669.tar.gz | |
Add ProRes FOURCCs to isom.c
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e65b1934bf4f2fbde611b75ea6c0c871daaf0b56)
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 6 |
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 }, }; |