aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/x86/output.asm
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-31 14:02:35 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-10-31 14:02:35 +0100
commit78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (patch)
treef4bfafaf29f67c4e8224a8b2fac8a19c00a7c1f9 /libswscale/x86/output.asm
parent9766d9c9851577d8162d5f006dffc721902a1409 (diff)
parent652f5185945c8405fc57aed353286858df8d066f (diff)
downloadffmpeg-78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d.tar.gz
Merge commit '652f5185945c8405fc57aed353286858df8d066f'
* commit '652f5185945c8405fc57aed353286858df8d066f': x86: mmx2 ---> mmxext in comments and messages Conflicts: libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/x86/output.asm')
-rw-r--r--libswscale/x86/output.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm
index cb230b181b..ec253ba5eb 100644
--- a/libswscale/x86/output.asm
+++ b/libswscale/x86/output.asm
@@ -218,10 +218,10 @@ cglobal yuv2planeX_%1, %3, 8, %2, filter, fltsize, src, dst, w, dither, offset
%else ; %1 == 9/10
%if cpuflag(sse4)
packusdw m2, m1
-%else ; mmx2/sse2
+%else ; mmxext/sse2
packssdw m2, m1
pmaxsw m2, m6
-%endif ; mmx2/sse2/sse4/avx
+%endif ; mmxext/sse2/sse4/avx
pminsw m2, [yuv2yuvX_%1_upper]
%endif ; %1 == 9/10/16
mova [dstq+r5*2], m2