[FFmpeg-cvslog] Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Aug 27 21:09:30 2014 +0200| [b3b05a11d31d544025c0400a1c6bc70124300a86] | committer: Michael Niedermayer

Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'

* commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5':
  cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs

Conflicts:
	libavcodec/mpeg4videodec.c
	libavcodec/x86/Makefile
	libavcodec/x86/dct-test.c
	libavcodec/x86/xvididct_sse2.c
	libavcodec/xvididct.c

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

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