diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 17:13:45 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 17:13:45 +0400 |
| commit | 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 (patch) | |
| tree | 192b6341b447e51b2121dc17509ce852fa36405b /libavcodec/x86/ac3dsp.asm | |
| parent | b91fa5fcca70bdf188b757084edd444d4d8530c9 (diff) | |
| parent | 9a07c1332cfe092b57b5758f22b686ca58806c60 (diff) | |
Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'
* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
parser: Move Doxygen documentation to the header files
PGS subtitles: Expose forced flag
x86: PMINUB: port to cpuflags
Conflicts:
libavcodec/avcodec.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/ac3dsp.asm')
| -rw-r--r-- | libavcodec/x86/ac3dsp.asm | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavcodec/x86/ac3dsp.asm b/libavcodec/x86/ac3dsp.asm index d97d8d3b0b..872d39e749 100644 --- a/libavcodec/x86/ac3dsp.asm +++ b/libavcodec/x86/ac3dsp.asm @@ -63,12 +63,10 @@ cglobal ac3_exponent_min, 3, 4, 2, exp, reuse_blks, expn, offset REP_RET %endmacro -%define PMINUB PMINUB_MMX %define LOOP_ALIGN INIT_MMX mmx AC3_EXPONENT_MIN %if HAVE_MMXEXT_EXTERNAL -%define PMINUB PMINUB_MMXEXT %define LOOP_ALIGN ALIGN 16 INIT_MMX mmxext AC3_EXPONENT_MIN @@ -77,7 +75,6 @@ AC3_EXPONENT_MIN INIT_XMM sse2 AC3_EXPONENT_MIN %endif -%undef PMINUB %undef LOOP_ALIGN ;----------------------------------------------------------------------------- |