[FFmpeg-cvslog] Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 13:21:18 2013 +0200| [3fee9fa0223263d0bcc1eb108a9499180705d3be] | committer: Michael Niedermayer

Merge commit '28bc406c84b04a5f1458b90ff52ddbec73e46202'

* commit '28bc406c84b04a5f1458b90ff52ddbec73e46202':
  mjpeg: Use hpeldsp instead of dsputil for half-pel functions
  svq1enc: Use hpeldsp instead of dsputil for half-pel functions

Conflicts:
	configure
	libavcodec/mjpegdec.c
	libavcodec/svq1enc.c

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

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