[FFmpeg-cvslog] Merge commit '2f6bc5f7c193477c2ebc0acce8f2d5551445e129'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 10:12:07 2013 +0200| [ab4ba6b74d9ef287991e68b5b21d9539ea10a628] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ab4ba6b74d9ef287991e68b5b21d9539ea10a628
---