Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:30:01 +0000 (01:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:30:01 +0000 (01:30 +0200)
commit0f69f02eb746124536a81effe9000a4dc876c7d8
treed6842dcf0a9e76a3112796bba55bafefa85d31b6
parent0aba7192e12bb5e4908c957ee593e0ff3d7f7fe4
parent149fa0b7ac180fe1df48a2e379c560813555bf57
Merge commit '149fa0b7ac180fe1df48a2e379c560813555bf57'

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

Conflicts:
libavcodec/mpegvideo.h

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