Merge commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 08:12:07 +0000 (10:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 08:12:07 +0000 (10:12 +0200)
commitab4ba6b74d9ef287991e68b5b21d9539ea10a628
tree819dc7b11916f5c7c21638469df63dab925a52d9
parent3c6621708b9392cd8a11dab6bb9e98f1804dcf47
parent2f6bc5f7c193477c2ebc0acce8f2d5551445e129
Merge commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129'

* commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129':
  svq3: Use hpeldsp instead of dsputil for half-pel functions
  mpegvideo: Use hpeldsp instead of dsputil for half-pel functions
  svq1: Use hpeldsp instead of dsputil for half-pel functions
  mimic: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
configure
libavcodec/motion_est.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h

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