diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 21:15:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-22 21:15:50 +0200 |
| commit | a5b2b22d9a45c9634e6947d43945ebafe121abec (patch) | |
| tree | 576acfb06100809f34f224253b7a15ad5b933c09 /tests/ref/fate/lossless-meridianaudio | |
| parent | d1dc22dddd7937232a1d073b9d72c51587c0b9ab (diff) | |
| parent | c0b105756f61d253bdabcc2bb49453a2557e7c3b (diff) | |
| download | ffmpeg-a5b2b22d9a45c9634e6947d43945ebafe121abec.tar.gz | |
Merge commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b'
* commit 'c0b105756f61d253bdabcc2bb49453a2557e7c3b':
txd: Use the TextureDSP module for decoding
Conflicts:
configure
libavcodec/s3tc.c
libavcodec/s3tc.h
libavcodec/txd.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/lossless-meridianaudio')
0 files changed, 0 insertions, 0 deletions