aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter/x86
diff options
context:
space:
mode:
authorLoren Merritt <lorenm@u.washington.edu>2012-09-22 01:43:16 +0200
committerReinhard Tartler <siretart@tauware.de>2013-03-16 07:58:07 +0100
commit1e7f825a9b212f838cf6df74da70d33113919dbf (patch)
treeadaab3cc3b637e9fe437961af27d47de5f0c24b5 /libavfilter/x86
parenta0361a6c30905ee428373e48718d9c3915cbeece (diff)
downloadffmpeg-1e7f825a9b212f838cf6df74da70d33113919dbf.tar.gz
hqdn3d: Fix out of array read in LOWPASS
CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 5b3c1aecb253828d09fa9825c5a4aed97badf086) Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'libavfilter/x86')
-rw-r--r--libavfilter/x86/hqdn3d.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/x86/hqdn3d.asm b/libavfilter/x86/hqdn3d.asm
index dee2c96131..02632a1f09 100644
--- a/libavfilter/x86/hqdn3d.asm
+++ b/libavfilter/x86/hqdn3d.asm
@@ -39,6 +39,7 @@ SECTION .text
%endif
%if %3 != 16
shl %1, 16-%3
+ add %1, (1<<(15-%3))-1
%endif
%endmacro
@@ -86,7 +87,6 @@ ALIGN 16
mov [frameantq+xq*2], t0w
movifnidn dstq, dstmp
%if %1 != 16
- add t0d, (1<<(15-%1))-1
shr t0d, 16-%1 ; could eliminate this by storing from t0h, but only with some contraints on register allocation
%endif
%if %1 == 8