diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 18:47:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-22 18:59:23 +0200 |
| commit | 7a556ebccfd6baf971d998127f9a1518b42830ae (patch) | |
| tree | 14ae2456ae3e39588f1dfff4a6f4109ca35e152d /libavcodec/h264chroma.c | |
| parent | 430d69c9421f2100e65b7e07c8d2a0f39534cbb6 (diff) | |
| parent | 0c15a9aa7e1654a19144eb594f9639a57fd47482 (diff) | |
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>
Diffstat (limited to 'libavcodec/h264chroma.c')
| -rw-r--r-- | libavcodec/h264chroma.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264chroma.c b/libavcodec/h264chroma.c index 3b780a04e2..ed41afe686 100644 --- a/libavcodec/h264chroma.c +++ b/libavcodec/h264chroma.c @@ -47,8 +47,6 @@ void ff_h264chroma_init(H264ChromaContext *c, int bit_depth) ff_h264chroma_init_arm(c, bit_depth); if (ARCH_PPC) ff_h264chroma_init_ppc(c, bit_depth); - if (ARCH_SH4) - ff_h264chroma_init_sh4(c, bit_depth); if (ARCH_X86) ff_h264chroma_init_x86(c, bit_depth); } |