diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 23:24:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 23:34:56 +0200 |
| commit | ff68b83968cba999a15b7c981c1bbcc2d608cad2 (patch) | |
| tree | 942b1ea0bb0cd4c72813ad81808b7a5548a427d8 /libavcodec/codec_desc.c | |
| parent | f067ee57c95d724ff795f8d6b0c6ba05010008f1 (diff) | |
| parent | 5c018ee18895f88e9e1d2174059dcdd48bf872d2 (diff) | |
| download | ffmpeg-ff68b83968cba999a15b7c981c1bbcc2d608cad2.tar.gz | |
Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'
* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
DirectDraw Surface image decoder
Conflicts:
Changelog
configure
doc/general.texi
libavcodec/Makefile
libavcodec/version.h
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index a5664906e1..b7e8c5da46 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1283,6 +1283,14 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_DDS, + .type = AVMEDIA_TYPE_VIDEO, + .name = "dds", + .long_name = NULL_IF_CONFIG_SMALL("DirectDraw Surface image decoder"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY | + AV_CODEC_PROP_LOSSLESS, + }, + { .id = AV_CODEC_ID_DPX, .type = AVMEDIA_TYPE_VIDEO, .name = "dpx", |