diff options
| author | Jimmy Christensen <jimmy@ghost.dk> | 2012-04-06 06:02:25 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-04-01 01:13:09 +0200 |
| commit | 38389058c3308758c6365abd0f6b45c5e62bb90b (patch) | |
| tree | 3ac1aa7d056b3691f042e9d87ec89e2ff6048b6a /libavformat | |
| parent | 678e455f1dc09265464b13d936d9fda62bc2bf43 (diff) | |
| download | ffmpeg-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')
| -rw-r--r-- | libavformat/img2.c | 1 | ||||
| -rw-r--r-- | libavformat/isom.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 5e842cf178..847c613929 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -70,6 +70,7 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_JPEG2000, "jpc" }, { AV_CODEC_ID_JPEG2000, "j2k" }, { AV_CODEC_ID_DPX, "dpx" }, + { AV_CODEC_ID_EXR, "exr" }, { AV_CODEC_ID_PICTOR, "pic" }, { AV_CODEC_ID_WEBP, "webp" }, { AV_CODEC_ID_XBM, "xbm" }, 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 */ |