[FFmpeg-cvslog] Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'

Michael Niedermayer git at videolan.org
Wed Sep 3 04:10:22 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  3 03:55:23 2014 +0200| [5b58d79a99658200ee5562999b16b5a8fa729b22] | committer: Michael Niedermayer

Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'

* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
  xvid: Add C IDCT

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b58d79a99658200ee5562999b16b5a8fa729b22
---





More information about the ffmpeg-cvslog mailing list