[FFmpeg-cvslog] Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 01:30:01 2015 +0200| [0f69f02eb746124536a81effe9000a4dc876c7d8] | committer: Michael Niedermayer

Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'

* commit '149fa0b7ac180fe1df48a2e379c560813555bf57':
  mpegvideo: Move MotionEstContext and function declarations to a separate header

Conflicts:
	libavcodec/mpegvideo.h

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

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