summaryrefslogtreecommitdiff
path: root/libavformat/isom.c
diff options
context:
space:
mode:
authorJimmy Christensen <jimmy@ghost.dk>2012-04-06 06:02:25 +0000
committerVittorio Giovara <vittorio.giovara@gmail.com>2014-04-01 01:13:09 +0200
commit38389058c3308758c6365abd0f6b45c5e62bb90b (patch)
tree3ac1aa7d056b3691f042e9d87ec89e2ff6048b6a /libavformat/isom.c
parent678e455f1dc09265464b13d936d9fda62bc2bf43 (diff)
downloadffmpeg-38389058c3308758c6365abd0f6b45c5e62bb90b.tar.gz
OpenEXR decoder
Additional fixes and enhancements by Vittorio Giovara, Gonzalo Garramuno, Nicolas George, Paul B Mahol and Michael Niedermayer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavformat/isom.c')
-rw-r--r--libavformat/isom.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index efe97b6c59..9bf8db499c 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -229,6 +229,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') },
{ AV_CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */
{ AV_CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */
+ { AV_CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, /* OpenEXR */
{ AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */
{ AV_CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */