diff options
author | 周晓勇 <zhouxiaoyong@loongson.cn> | 2015-09-02 18:00:24 +0800 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-08 22:31:44 +0200 |
commit | 0752e44b1f0f36da10ee88ec1ab948dc33416252 (patch) | |
tree | 6101bf1e8734841cf3602e116d46acab05ad31d9 | |
parent | 1d42df72926cfd956f6b11ed554e897ecc2dfd45 (diff) | |
download | ffmpeg-0752e44b1f0f36da10ee88ec1ab948dc33416252.tar.gz |
avcodec: loongson delete invalid simple idct put and add optimization
Change-Id: I23a36c65915f01a1cf20e317c14b8eaaa62958b4
Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Fixes Decoding of http://loongnix.org/ftp/multimedia/testing/nanocore_720p_24fps_mpeg4_ac3_short.avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a78656a18784e0ef42350b7585f5d9ecf505eb9b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/mips/idctdsp_init_mips.c | 2 | ||||
-rw-r--r-- | libavcodec/mips/simple_idct_mmi.c | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/libavcodec/mips/idctdsp_init_mips.c b/libavcodec/mips/idctdsp_init_mips.c index ac21669648..8c26bca538 100644 --- a/libavcodec/mips/idctdsp_init_mips.c +++ b/libavcodec/mips/idctdsp_init_mips.c @@ -49,8 +49,6 @@ static av_cold void idctdsp_init_mmi(IDCTDSPContext *c, AVCodecContext *avctx, (avctx->bits_per_raw_sample != 10) && (avctx->bits_per_raw_sample != 12) && (avctx->idct_algo == FF_IDCT_AUTO)) { - c->idct_put = ff_simple_idct_put_mmi; - c->idct_add = ff_simple_idct_add_mmi; c->idct = ff_simple_idct_mmi; c->perm_type = FF_IDCT_PERM_NONE; } diff --git a/libavcodec/mips/simple_idct_mmi.c b/libavcodec/mips/simple_idct_mmi.c index 3c1a4f7eaf..628e13f7d2 100644 --- a/libavcodec/mips/simple_idct_mmi.c +++ b/libavcodec/mips/simple_idct_mmi.c @@ -54,7 +54,7 @@ DECLARE_ALIGNED(8, static const int16_t, coeffs)[]= { C3, -C1, C3, -C1 }; -static void simple_idct_mmi(int16_t *block) +void ff_simple_idct_mmi(int16_t *block) { DECLARE_ALIGNED(8, int64_t, align_tmp)[16]; int16_t * const temp= (int16_t*)align_tmp; @@ -814,20 +814,3 @@ static void simple_idct_mmi(int16_t *block) : "$10","$11" ); } - -void ff_simple_idct_mmi(int16_t *block) -{ - simple_idct_mmi(block); -} - -void ff_simple_idct_put_mmi(uint8_t *dest, int32_t line_size, int16_t *block) -{ - simple_idct_mmi(block); - ff_put_pixels_clamped_mmi(block, dest, line_size); -} - -void ff_simple_idct_add_mmi(uint8_t *dest, int32_t line_size, int16_t *block) -{ - simple_idct_mmi(block); - ff_add_pixels_clamped_mmi(block, dest, line_size); -} |