diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
| commit | 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 (patch) | |
| tree | 192b6341b447e51b2121dc17509ce852fa36405b /libavutil | |
| parent | b91fa5fcca70bdf188b757084edd444d4d8530c9 (diff) | |
| parent | 9a07c1332cfe092b57b5758f22b686ca58806c60 (diff) | |
| download | ffmpeg-1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9.tar.gz | |
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 'libavutil')
| -rw-r--r-- | libavutil/x86/x86util.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 89e8cd82f4..ade21c68bb 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -530,14 +530,14 @@ movh [%7+%8], %4 %endmacro -%macro PMINUB_MMX 3 ; dst, src, tmp +%macro PMINUB 3 ; dst, src, ignored +%if cpuflag(mmxext) + pminub %1, %2 +%else ; dst, src, tmp mova %3, %1 psubusb %3, %2 psubb %1, %3 -%endmacro - -%macro PMINUB_MMXEXT 3 ; dst, src, ignored - pminub %1, %2 +%endif %endmacro %macro SPLATW 2-3 0 |