[FFmpeg-cvslog] Merge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 09:57:00 2013 +0200| [3c6621708b9392cd8a11dab6bb9e98f1804dcf47] | committer: Michael Niedermayer

Merge commit '8071264f2196d71ff49c3944c33f8d3d83f548f1'

* commit '8071264f2196d71ff49c3944c33f8d3d83f548f1':
  interplayvideo: Use hpeldsp instead of dsputil for half-pel functions
  bink: Use hpeldsp instead of dsputil for half-pel functions
  indeo3: Use hpeldsp instead of dsputil for half-pel functions
  vp56: Use hpeldsp instead of dsputil for half-pel functions
  vp3: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
	libavcodec/bink.c
	libavcodec/indeo3.c
	libavcodec/vp56.c

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

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