diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 03:55:23 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 04:09:38 +0200 |
commit | 5b58d79a99658200ee5562999b16b5a8fa729b22 (patch) | |
tree | bd10ed2708d7485f5156c4e67f8325bcff5bd999 /tests/ref/acodec/adpcm-swf-trellis | |
parent | 5db23c07a3f76d31e8e3178f8bacb68289bba62b (diff) | |
parent | 7a1d6ddd2c6b2d66fbc1afa584cf506930a26453 (diff) | |
download | ffmpeg-5b58d79a99658200ee5562999b16b5a8fa729b22.tar.gz |
Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
xvid: Add C IDCT
Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c
See: 298b3b6c1f8f66b9bc6de53a7b51d3de745d946b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/acodec/adpcm-swf-trellis')
0 files changed, 0 insertions, 0 deletions