aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-28 19:22:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-28 19:22:00 +0100
commite346a5938317f40410b8f267799f4e2707cf575a (patch)
tree7be30f53b67716525658761eea3e6451b6299c8b /libavcodec
parent169243112c1e310d90c030fb258092f6d2e46117 (diff)
parentad507d7907457e678900bac132122ba7be4644cb (diff)
downloadffmpeg-e346a5938317f40410b8f267799f4e2707cf575a.tar.gz
Merge commit 'ad507d7907457e678900bac132122ba7be4644cb'
* commit 'ad507d7907457e678900bac132122ba7be4644cb': x86: dcadsp: implement SSE lfe_dir Conflicts: libavcodec/x86/dcadsp.asm See: 169243112c1e310d90c030fb258092f6d2e46117 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/x86/dcadsp.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/dcadsp.asm b/libavcodec/x86/dcadsp.asm
index f4149d2658..b9e8b8bf0f 100644
--- a/libavcodec/x86/dcadsp.asm
+++ b/libavcodec/x86/dcadsp.asm
@@ -99,7 +99,7 @@ INT8X8_FMUL_INT32
%else
%define OFFSET NUM_COEF*count
%endif
-; for v0, incrementint and for v1, decrementing
+; for v0, incrementing and for v1, decrementing
mova va, [cf0q + OFFSET]
mova vb, [cf0q + OFFSET + 4*NUM_COEF]
%if %0 == 3
@@ -133,7 +133,7 @@ INT8X8_FMUL_INT32
jl .loop%1
%endmacro
-; dca_lfe_fir(float *out, float *in, float *coefs)
+; void dca_lfe_fir(float *out, float *in, float *coefs)
%macro DCA_LFE_FIR 1
cglobal dca_lfe_fir%1, 3,3,6-%1, out, in, cf0
%define IN1 m3