diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:05:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-01 03:16:56 +0200 |
| commit | 95582b5ccc9a7f7adcb28751f731960c35527e05 (patch) | |
| tree | f972334e1c8dcdba8ea9eaef6f372b23acf7ff2c /libavcodec/codec_desc.c | |
| parent | 9e3c8f61feb2463c06aab4dad60de08dbee9d891 (diff) | |
| parent | 38389058c3308758c6365abd0f6b45c5e62bb90b (diff) | |
| download | ffmpeg-95582b5ccc9a7f7adcb28751f731960c35527e05.tar.gz | |
Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'
* commit '38389058c3308758c6365abd0f6b45c5e62bb90b':
OpenEXR decoder
Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/avcodec.h
libavcodec/exr.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index a1f0d98058..f3a10ade3a 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1103,14 +1103,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY, }, { - .id = AV_CODEC_ID_EXR, - .type = AVMEDIA_TYPE_VIDEO, - .name = "exr", - .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | - AV_CODEC_PROP_LOSSLESS, - }, - { .id = AV_CODEC_ID_AVRP, .type = AVMEDIA_TYPE_VIDEO, .name = "avrp", @@ -1272,6 +1264,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_EXR, + .type = AVMEDIA_TYPE_VIDEO, + .name = "exr", + .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | + AV_CODEC_PROP_LOSSLESS, + }, + { .id = AV_CODEC_ID_GIF, .type = AVMEDIA_TYPE_VIDEO, .name = "gif", |