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/hpeldsp.h | |
| 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/hpeldsp.h')
| -rw-r--r-- | libavcodec/hpeldsp.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/hpeldsp.h b/libavcodec/hpeldsp.h index bf868a5c34..ec9006c31d 100644 --- a/libavcodec/hpeldsp.h +++ b/libavcodec/hpeldsp.h @@ -98,7 +98,6 @@ void ff_hpeldsp_init_alpha(HpelDSPContext *c, int flags); void ff_hpeldsp_init_arm(HpelDSPContext *c, int flags); void ff_hpeldsp_init_bfin(HpelDSPContext *c, int flags); void ff_hpeldsp_init_ppc(HpelDSPContext *c, int flags); -void ff_hpeldsp_init_sh4(HpelDSPContext *c, int flags); void ff_hpeldsp_init_vis(HpelDSPContext *c, int flags); void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags); |