[FFmpeg-cvslog] Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 16:56:40 2014 +0200| [e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631] | committer: Michael Niedermayer

Merge commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400'

* commit '6484149158b6fc6d13d2b2ef84cb26a2d3275400':
  lavc: make the xvid-specific "gmc" flag a private option of libxvid

Conflicts:
	libavcodec/libxvid.c
	libavcodec/version.h

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

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