diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:02:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:02:35 +0100 |
| commit | 78ec407d5a7ed8a00d49e7555e2cc55e7786fd1d (patch) | |
| tree | f4bfafaf29f67c4e8224a8b2fac8a19c00a7c1f9 /libswscale/x86/yuv2rgb.c | |
| parent | 9766d9c9851577d8162d5f006dffc721902a1409 (diff) | |
| parent | 652f5185945c8405fc57aed353286858df8d066f (diff) | |
| download | ffmpeg-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/yuv2rgb.c')
| -rw-r--r-- | libswscale/x86/yuv2rgb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index 4d8e79d8d4..ea52e3c71b 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -3,7 +3,7 @@ * * Copyright (C) 2009 Konstantin Shishkov * - * MMX/MMX2 template stuff (needed for fast movntq support), + * MMX/MMXEXT template stuff (needed for fast movntq support), * 1,4,8bpp support and context / deglobalize stuff * by Michael Niedermayer (michaelni@gmx.at) * @@ -58,7 +58,7 @@ DECLARE_ASM_CONST(8, uint64_t, pb_07) = 0x0707070707070707ULL; #include "yuv2rgb_template.c" #endif /* HAVE_MMX_INLINE */ -//MMX2 versions +// MMXEXT versions #if HAVE_MMXEXT_INLINE #undef RENAME #undef COMPILE_TEMPLATE_MMXEXT |