diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 13:18:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 13:34:32 +0200 |
| commit | c617bed34f39a122ab1f89581ddce9cc63885383 (patch) | |
| tree | ed2c0bd467f5f5c912ac46a2b95457a5647ced75 /libavcodec/x86/dsputilenc_mmx.c | |
| parent | 98298eb1034bddb4557fa689553dae793c2b0092 (diff) | |
| parent | ede3d6400d7c06863e6eb4bcff5f676480ae6b5e (diff) | |
| download | ffmpeg-c617bed34f39a122ab1f89581ddce9cc63885383.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
MSS1 and MSS2: set final pixel format after common stuff has been initialised
MSS2 decoder
configure: handle --disable-asm before check_deps
x86: Split inline and external assembly #ifdefs
configure: x86: Separate inline from standalone assembler capabilities
pktdumper: Use a custom define instead of PATH_MAX for buffers
pktdumper: Use av_strlcpy instead of strncpy
pktdumper: Use sizeof(variable) instead of the direct buffer length
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/dct-test.c
libavcodec/imgconvert.c
libavcodec/mss12.c
libavcodec/version.h
libavfilter/x86/gradfun.c
libswscale/x86/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputilenc_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 65c38fa89d..9f9680b596 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -983,7 +983,7 @@ DCT_SAD_FUNC(mmx2) DCT_SAD_FUNC(sse2) #undef MMABS -#if HAVE_SSSE3 +#if HAVE_SSSE3_INLINE #define MMABS(a,z) MMABS_SSSE3(a,z) DCT_SAD_FUNC(ssse3) #undef MMABS @@ -1063,7 +1063,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si #undef SCALE_OFFSET #undef PMULHRW -#if HAVE_SSSE3 +#if HAVE_SSSE3_INLINE #undef PHADDD #define DEF(x) x ## _ssse3 #define SET_RND(x) @@ -1082,7 +1082,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si #undef SCALE_OFFSET #undef PMULHRW #undef PHADDD -#endif //HAVE_SSSE3 +#endif /* HAVE_SSSE3_INLINE */ #endif /* HAVE_INLINE_ASM */ @@ -1162,7 +1162,7 @@ void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) c->sum_abs_dctelem= sum_abs_dctelem_sse2; } -#if HAVE_SSSE3 +#if HAVE_SSSE3_INLINE if(mm_flags & AV_CPU_FLAG_SSSE3){ if(!(avctx->flags & CODEC_FLAG_BITEXACT)){ c->try_8x8basis= try_8x8basis_ssse3; |