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 /libavformat | |
| parent | f067ee57c95d724ff795f8d6b0c6ba05010008f1 (diff) | |
| parent | 5c018ee18895f88e9e1d2174059dcdd48bf872d2 (diff) | |
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 'libavformat')
| -rw-r--r-- | libavformat/img2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index cf8a47856f..184600ff53 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -45,6 +45,7 @@ static const IdStrMap img_tags[] = { { AV_CODEC_ID_PBM, "pbm" }, { AV_CODEC_ID_PAM, "pam" }, { AV_CODEC_ID_ALIAS_PIX, "pix" }, + { AV_CODEC_ID_DDS, "dds" }, { AV_CODEC_ID_MPEG1VIDEO, "mpg1-img" }, { AV_CODEC_ID_MPEG2VIDEO, "mpg2-img" }, { AV_CODEC_ID_MPEG4, "mpg4-img" }, |