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/avcodec.h | |
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 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 60084a523a..3ce33683ab 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -294,6 +294,7 @@ enum AVCodecID { AV_CODEC_ID_TDSC, AV_CODEC_ID_HQ_HQA, AV_CODEC_ID_HAP, + AV_CODEC_ID_DDS, AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'), AV_CODEC_ID_Y41P = MKBETAG('Y','4','1','P'), |