]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '4fbb62a21bd04bf261da2382d5ba6c249c702af8':
  mpegvideo: Move ME_MAP_* defines to the only place they are used

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

Simple merge
Simple merge