[FFmpeg-cvslog] Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 15:36:23 2013 +0200| [d2d2c309e8f3bbe24d9592aec87c5875473f623b] | committer: Michael Niedermayer

Merge commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc'

* commit '54cd5e4f92de6bd0fb8e24069153b0156c8136bc':
  dsputil: Remove hpel functions (moved to hpeldsp)

Conflicts:
	libavcodec/hpeldsp.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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