diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-06 16:22:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-06 16:23:17 +0200 |
| commit | 40112e7b3589e1cf37cd80a7d2e8baad4cb8c523 (patch) | |
| tree | 29d5c5475e673228440935187610210e9ae85840 /libavcodec/x86 | |
| parent | 2bb62455c899cdccbdc2a6ad33f9582008ed9f05 (diff) | |
| parent | 2b3660084f03c9dbf052e64229b3316ac40c0edf (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: Allow setting the ld parameter from the config file
x86: dsputil: Do not redundantly check for CPU caps before calling init funcs
configure: Disable some warnings in MSVC
x86: vp56: cmov version of vp56_rac_get_prob requires inline asm
avopt: fix examples to match the same style about default values as the actual code.
configure: Add support for MSVC cl.exe/link.exe
lavu: add snprintf(), vsnprint() and strtod() replacements for MS runtime.
Conflicts:
libavutil/opt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 8 | ||||
| -rw-r--r-- | libavcodec/x86/vp56_arith.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index d293e19b59..93f09fb8b6 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -3189,13 +3189,13 @@ void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx) if (mm_flags & AV_CPU_FLAG_MMXEXT) dsputil_init_mmx2(c, avctx, mm_flags); - if (mm_flags & AV_CPU_FLAG_3DNOW && HAVE_AMD3DNOW) + if (mm_flags & AV_CPU_FLAG_3DNOW) dsputil_init_3dnow(c, avctx, mm_flags); - if (mm_flags & AV_CPU_FLAG_3DNOWEXT && HAVE_AMD3DNOWEXT) + if (mm_flags & AV_CPU_FLAG_3DNOWEXT) dsputil_init_3dnowext(c, avctx, mm_flags); - if (mm_flags & AV_CPU_FLAG_SSE && HAVE_SSE) + if (mm_flags & AV_CPU_FLAG_SSE) dsputil_init_sse(c, avctx, mm_flags); if (mm_flags & AV_CPU_FLAG_SSE2) @@ -3204,7 +3204,7 @@ void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx) if (mm_flags & AV_CPU_FLAG_SSSE3) dsputil_init_ssse3(c, avctx, mm_flags); - if (mm_flags & AV_CPU_FLAG_SSE4 && HAVE_SSE) + if (mm_flags & AV_CPU_FLAG_SSE4) dsputil_init_sse4(c, avctx, mm_flags); if (mm_flags & AV_CPU_FLAG_AVX) diff --git a/libavcodec/x86/vp56_arith.h b/libavcodec/x86/vp56_arith.h index ddbf38b1a9..e71dbf8ed0 100644 --- a/libavcodec/x86/vp56_arith.h +++ b/libavcodec/x86/vp56_arith.h @@ -24,7 +24,7 @@ #ifndef AVCODEC_X86_VP56_ARITH_H #define AVCODEC_X86_VP56_ARITH_H -#if HAVE_FAST_CMOV +#if HAVE_INLINE_ASM && HAVE_FAST_CMOV #define vp56_rac_get_prob vp56_rac_get_prob static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob) { |