diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:53:19 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 11:53:19 +0200 |
commit | 0724b4a16d6b88b311610e96c7ba341a4b33965d (patch) | |
tree | 4e80fea21e5c1dd58bb706cecb95283f81e8846f /libavcodec/arm | |
parent | 944ad46182483ff52573ec3c827c86058b225d16 (diff) | |
parent | 62844c3fd66940c7747e9b2bb7804e265319f43f (diff) |
Merge commit '62844c3fd66940c7747e9b2bb7804e265319f43f'
* commit '62844c3fd66940c7747e9b2bb7804e265319f43f':
h264: Integrate clear_blocks calls with IDCT
Conflicts:
libavcodec/arm/h264idct_neon.S
libavcodec/h264idct_template.c
libavcodec/x86/h264_idct.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
-rw-r--r-- | libavcodec/arm/h264idct_neon.S | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/arm/h264idct_neon.S b/libavcodec/arm/h264idct_neon.S index fa5b90c23a..2edeca2cbc 100644 --- a/libavcodec/arm/h264idct_neon.S +++ b/libavcodec/arm/h264idct_neon.S @@ -187,8 +187,8 @@ endfunc vshr.s16 q2, q10, #1 vadd.i16 q0, q8, q12 vld1.16 {q14-q15},[r1,:128] - vst1.16 {q7}, [r1,:128]! - vst1.16 {q7}, [r1,:128]! + vst1.16 {q3}, [r1,:128]! + vst1.16 {q3}, [r1,:128]! vsub.i16 q1, q8, q12 vshr.s16 q3, q14, #1 vsub.i16 q2, q2, q14 @@ -267,16 +267,16 @@ endfunc .endm function ff_h264_idct8_add_neon, export=1 - vmov.i16 q7, #0 + vmov.i16 q3, #0 vld1.16 {q8-q9}, [r1,:128] - vst1.16 {q7}, [r1,:128]! - vst1.16 {q7}, [r1,:128]! + vst1.16 {q3}, [r1,:128]! + vst1.16 {q3}, [r1,:128]! vld1.16 {q10-q11},[r1,:128] - vst1.16 {q7}, [r1,:128]! - vst1.16 {q7}, [r1,:128]! + vst1.16 {q3}, [r1,:128]! + vst1.16 {q3}, [r1,:128]! vld1.16 {q12-q13},[r1,:128] - vst1.16 {q7}, [r1,:128]! - vst1.16 {q7}, [r1,:128]! + vst1.16 {q3}, [r1,:128]! + vst1.16 {q3}, [r1,:128]! idct8x8_cols 0 idct8x8_cols 1 |