aboutsummaryrefslogtreecommitdiffstats
path: root/tests/fate/adpcm.mak
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-29 03:52:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-29 03:52:16 +0200
commitca90ca8ce365261355f3b66936b9cc011fdd1cdc (patch)
tree1ddcea613050917b11a53069c43ad6bc1725aec1 /tests/fate/adpcm.mak
parenta58e10e5d1e9b26733087f536a0eb0c525523218 (diff)
parent6647aa0426e73839b9b1d1c9d86188f469167531 (diff)
downloadffmpeg-ca90ca8ce365261355f3b66936b9cc011fdd1cdc.tar.gz
Merge commit '6647aa0426e73839b9b1d1c9d86188f469167531'
* commit '6647aa0426e73839b9b1d1c9d86188f469167531': indeo4: add missing Haar and slanted transforms dxtory v2 support Conflicts: libavcodec/indeo4.c libavcodec/ivi_dsp.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/adpcm.mak')
0 files changed, 0 insertions, 0 deletions