Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 01:55:23 +0000 (03:55 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 3 Sep 2014 02:09:38 +0000 (04:09 +0200)
* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
  xvid: Add C IDCT

Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c

See: 298b3b6c1f8f66b9bc6de53a7b51d3de745d946b
Merged-by: Michael Niedermayer <michaelni@gmx.at>

No differences found