149fa0b7ac
* commit '149fa0b7ac': mpegvideo: Move MotionEstContext and function declarations to a separate header Conflicts: libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>