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 /tests/ref/fate/dds-dx10-bc1a | |
| 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 'tests/ref/fate/dds-dx10-bc1a')
| -rw-r--r-- | tests/ref/fate/dds-dx10-bc1a | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/ref/fate/dds-dx10-bc1a b/tests/ref/fate/dds-dx10-bc1a new file mode 100644 index 0000000000..8cb4589e9b --- /dev/null +++ b/tests/ref/fate/dds-dx10-bc1a @@ -0,0 +1,2 @@ +#tb 0: 1/25 +0, 0, 0, 1, 16384, 0x473b484b |