diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 20:46:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-19 21:23:52 +0200 |
| commit | 2a976debc1de10c22c258583b543ab5b4bbe5974 (patch) | |
| tree | a2b0a12017a42e8a37365ca84a6bf2a0179311e8 /libavutil | |
| parent | 2ff935f4bb6173daf3361b2ac7b58c6e33994878 (diff) | |
| parent | 2b98377935384ecd22c2cd26106b9e03a6c9f598 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dv: Initialize encoder tables during encoder init.
dv: Replace some magic numbers by the appropriate #define.
FATE: pass the decoded output format and audio source file to enc_dec_pcm
FATE: specify the input format when decoding in enc_dec_pcm()
x86inc: support AVX abstraction for 2-operand instructions
configure: detect PGI compiler and set suitable flags
avconv: check for an incompatible changing channel layout
avio: make AVIOContext.av_class pointer to const
nutdec: add malloc check and fix const to non-const conversion warnings
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86inc.asm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 6b39f23a3b..d4f6926d08 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -856,7 +856,7 @@ INIT_XMM ;%1 == instruction ;%2 == 1 if float, 0 if int -;%3 == 1 if 4-operand (xmm, xmm, xmm, imm), 0 if 3-operand (xmm, xmm, xmm) +;%3 == 1 if 4-operand (xmm, xmm, xmm, imm), 0 if 2- or 3-operand (xmm, xmm, xmm) ;%4 == number of operands given ;%5+: operands %macro RUN_AVX_INSTR 6-7+ @@ -866,7 +866,11 @@ INIT_XMM %define %%size mmsize %endif %if %%size==32 - v%1 %5, %6, %7 + %if %0 >= 7 + v%1 %5, %6, %7 + %else + v%1 %5, %6 + %endif %else %if %%size==8 %define %%regmov movq @@ -952,6 +956,8 @@ AVX_INSTR cmppd, 1, 0, 0 AVX_INSTR cmpps, 1, 0, 0 AVX_INSTR cmpsd, 1, 0, 0 AVX_INSTR cmpss, 1, 0, 0 +AVX_INSTR cvtdq2ps, 1, 0, 0 +AVX_INSTR cvtps2dq, 1, 0, 0 AVX_INSTR divpd, 1, 0, 0 AVX_INSTR divps, 1, 0, 0 AVX_INSTR divsd, 1, 0, 0 |