Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'

* commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65':
  mpegvideo: Kill some disabled code

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavcodec/mpegvideo_motion.c
Simple merge

diff --cc libavcodec/mpegvideoencdsp.c
Simple merge