Merge commit '0c15a9aa7e1654a19144eb594f9639a57fd47482'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 16:47:16 +0000 (18:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 22 Apr 2013 16:59:23 +0000 (18:59 +0200)
commit7a556ebccfd6baf971d998127f9a1518b42830ae
tree14ae2456ae3e39588f1dfff4a6f4109ca35e152d
parent430d69c9421f2100e65b7e07c8d2a0f39534cbb6
parent0c15a9aa7e1654a19144eb594f9639a57fd47482
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@gmx.at>
libavcodec/h264chroma.c
libavcodec/h264chroma.h
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/sh4/dsputil_sh4.c
libavcodec/sh4/dsputil_sh4.h