diff options
| author | Jimmy Christensen <jimmy@ghost.dk> | 2012-04-06 08:02:25 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-06 10:32:09 +0400 |
| commit | b7ce3242f8000ad497a17c3288a59aa508cef31c (patch) | |
| tree | c39c010e3e0a012ca422a877dccfb769720b0463 /libavformat | |
| parent | 9e91a7d45b549dada2098b6c8e3b7f8f9d667f6e (diff) | |
lavc: add a OpenEXR decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/img2.c | 1 | ||||
| -rw-r--r-- | libavformat/isom.c | 1 | ||||
| -rw-r--r-- | libavformat/riff.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index b23e944809..47dbb621d1 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -70,6 +70,7 @@ static const IdStrMap img_tags[] = { { CODEC_ID_JPEG2000 , "jp2"}, { CODEC_ID_JPEG2000 , "jpc"}, { CODEC_ID_DPX , "dpx"}, + { CODEC_ID_EXR , "exr"}, { CODEC_ID_PICTOR , "pic"}, { CODEC_ID_XBM , "xbm"}, { CODEC_ID_XWD , "xwd"}, diff --git a/libavformat/isom.c b/libavformat/isom.c index 2042b65f48..9182008376 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -225,6 +225,7 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') }, { CODEC_ID_SGI, MKTAG('s', 'g', 'i', ' ') }, /* SGI */ { CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, /* DPX */ + { CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, /* OpenEXR */ { 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 */ diff --git a/libavformat/riff.c b/libavformat/riff.c index 80a44b07b4..ccb587a2b2 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -301,6 +301,7 @@ const AVCodecTag ff_codec_bmp_tags[] = { { CODEC_ID_ZEROCODEC, MKTAG('Z', 'E', 'C', 'O') }, { CODEC_ID_Y41P, MKTAG('Y', '4', '1', 'P') }, { CODEC_ID_FLIC, MKTAG('A', 'F', 'L', 'C') }, + { CODEC_ID_EXR, MKTAG('e', 'x', 'r', ' ') }, { CODEC_ID_NONE, 0 } }; |