Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:07:30 +0000 (16:07 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:07:30 +0000 (16:07 +0100)
commitadef752f1b187a12c0bfdfc8ce1b1ee7e5a2fb22
tree354653f132144d467aa2794da4d136334a8168cc
parent95a29b1a820503950b8684b2c4242b916b0f29cc
parent0e285c2f908789e96e29bfd969ad5eaaa0eece65
Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'

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

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideoencdsp.c