[FFmpeg-cvslog] Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 17:03:59 2014 +0200| [e77b9853ea66ef6c34b04d121c5b3d1afaa33971] | committer: Michael Niedermayer

Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'

* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
  lavc: move CODEC_FLAG_MV0 to mpegvideo

Conflicts:
	libavcodec/version.h

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

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