diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:44:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-08 05:44:56 +0100 |
| commit | 8be8dddd13f4da6e84a5315f95b4ff97775cee8e (patch) | |
| tree | 1807a226b1b6eaad1f357d83bf7c42fee49f9860 /libavcodec/arm/vp3dsp_neon.S | |
| parent | edba54630b6f6157802a167d04d4da4c33f52d72 (diff) | |
| parent | 952d3187d8eda7067fcd73f1d5f17837fa65eb34 (diff) | |
| download | ffmpeg-8be8dddd13f4da6e84a5315f95b4ff97775cee8e.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
arm: Add a missing # as prefix for an immediate constant
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/vp3dsp_neon.S')
| -rw-r--r-- | libavcodec/arm/vp3dsp_neon.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/arm/vp3dsp_neon.S b/libavcodec/arm/vp3dsp_neon.S index f133905efe..2942d488f5 100644 --- a/libavcodec/arm/vp3dsp_neon.S +++ b/libavcodec/arm/vp3dsp_neon.S @@ -355,7 +355,7 @@ function ff_vp3_idct_dc_add_neon, export=1 mov r3, r0 add r12, r12, #15 vdup.16 q15, r12 - mov r12, 0 + mov r12, #0 strh r12, [r2] vshr.s16 q15, q15, #5 |