[FFmpeg-cvslog] Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 20 15:11:06 2013 +0200| [fdb1f7eb7a802eec63a051499110842f3056cf9b] | committer: Michael Niedermayer

Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'

* commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493':
  sparc: hpeldsp: Move vis half-pel assembly from dsputil to hpeldsp

Conflicts:
	libavcodec/hpeldsp.h
	libavcodec/sparc/dsputil_vis.c
	libavcodec/sparc/hpeldsp_vis.c

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

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