[FFmpeg-cvslog] Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 12:11:13 2014 +0200| [3841f2ae665d527a7c8b3c226925995256adb917] | committer: Michael Niedermayer

Merge commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36'

* commit 'd35b94fbabd8beb5d566c0b5d01688aff62c3b36':
  avcodec: Rename xvidmmx IDCT to xvid

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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