diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:35:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:35:18 +0100 |
| commit | ea93ccf07991dbb0d90b913c0bf49f680fdc0ffc (patch) | |
| tree | f480704103df76937079555a2717f8c0c00bc1aa /libavcodec/x86/dsputilenc.asm | |
| parent | 55d8cac254ee2aeba051810ca92bb868fcbd8468 (diff) | |
| parent | 5b4dfbffc258f90a7d2540d21209ac23afcf7cd0 (diff) | |
| download | ffmpeg-ea93ccf07991dbb0d90b913c0bf49f680fdc0ffc.tar.gz | |
Merge commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0'
* commit '5b4dfbffc258f90a7d2540d21209ac23afcf7cd0':
x86: ABS1: port to cpuflags
v210x: cosmetics, reformat
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputilenc.asm')
| -rw-r--r-- | libavcodec/x86/dsputilenc.asm | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/x86/dsputilenc.asm b/libavcodec/x86/dsputilenc.asm index 3e7990d0a8..5b06d3ba1a 100644 --- a/libavcodec/x86/dsputilenc.asm +++ b/libavcodec/x86/dsputilenc.asm @@ -257,11 +257,9 @@ hadamard8_16_wrapper 0, 14 %endmacro INIT_MMX mmx -%define ABS1 ABS1_MMX HADAMARD8_DIFF INIT_MMX mmxext -%define ABS1 ABS1_MMXEXT HADAMARD8_DIFF INIT_XMM sse2 |