[FFmpeg-cvslog] Merge commit '0c15a9aa7e1654a19144eb594f9639a57fd47482'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 22 18:47:16 2013 +0200| [7a556ebccfd6baf971d998127f9a1518b42830ae] | committer: Michael Niedermayer

Merge commit '0c15a9aa7e1654a19144eb594f9639a57fd47482'

* commit '0c15a9aa7e1654a19144eb594f9639a57fd47482':
  sh4: Remove dubious aligned dsputil code

Conflicts:
	libavcodec/sh4/dsputil_align.c
	libavcodec/sh4/h264chroma_init.c
	libavcodec/sh4/hpeldsp.c
	libavcodec/sh4/qpel.c

If someone wants to maintain the sh4 code in ffmpeg, wants to
add more optimizations, or volunteers to maintain any of
what is removed here and can confirm that they are faster.
Then please contact us!

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

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