* commit '6e7b50b4':
  mpegvideo_enc: drop support for reusing the input motion vectors.

Conflicts:
	libavcodec/motion_est.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>