diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-23 00:24:10 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-23 00:34:56 +0300 |
| commit | ff68b83968cba999a15b7c981c1bbcc2d608cad2 (patch) | |
| tree | 942b1ea0bb0cd4c72813ad81808b7a5548a427d8 /Changelog | |
| 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 'Changelog')
| -rw-r--r-- | Changelog | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -5,6 +5,7 @@ version <next>: - colorkey video filter - BFSTM/BCSTM demuxer - little-endian ADPCM_THP decoder +- DirectDraw Surface image/texture decoder version 2.7: |