
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
xvid: Add C IDCT
Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c
See: 298b3b6c1f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
xvid: Add C IDCT
Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c
See: 298b3b6c1f
Merged-by: Michael Niedermayer <michaelni@gmx.at>