Merge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 00:34:47 +0000 (02:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jul 2014 00:34:51 +0000 (02:34 +0200)
commit8b395315a5e7eba743d815f0b9c3a42aaeefd297
tree577bc6c2b44ab722e101f03d653288b19351a831
parent0a9bab5be64ffb85b2597bfd6e506a7fce512c0b
parent4fbb62a21bd04bf261da2382d5ba6c249c702af8
Merge commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8'

* commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8':
  mpegvideo: Move ME_MAP_* defines to the only place they are used

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