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)
* commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65':
  mpegvideo: Kill some disabled code

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

Simple merge
Simple merge