diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-30 22:44:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-30 22:44:18 +0200 |
| commit | 64b25938e90253432d28ffd7d971f085c560a523 (patch) | |
| tree | 56ba6a39d7e8f14ebccdcc4db935164b5da624a2 /libavcodec/x86/dsputilenc_mmx.c | |
| parent | be24f85176d8e46c3154f1f51013f235b273183e (diff) | |
| parent | ceabc13f129cd6344b1eebdbe10119083fe5520e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputilenc_mmx: split assignment of ff_sse16_sse2 to SSE2 section.
dnxhdenc: add space between function argument type and comment.
x86: fmtconvert: add special asm for float_to_int16_interleave_misc_*
attributes: Add a definition of av_always_inline for MSVC
cmdutils: Pass the actual chosen encoder to filter_codec_opts
os_support: Add fallback definitions for stat flags
os_support: Rename the poll fallback function to ff_poll
network: Check for struct pollfd
os_support: Don't compare a negative number against socket descriptors
os_support: Include all the necessary headers for the win32 open function
x86: vc1: fix and enable optimised loop filter
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg.c
ffplay.c
libavformat/os_support.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputilenc_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index bf439ca5df..00e0a3fc37 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -1128,8 +1128,8 @@ void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) #endif c->pix_norm1 = pix_norm1_mmx; - c->sse[0] = (HAVE_YASM && mm_flags & AV_CPU_FLAG_SSE2) ? ff_sse16_sse2 : sse16_mmx; - c->sse[1] = sse8_mmx; + c->sse[0] = sse16_mmx; + c->sse[1] = sse8_mmx; c->vsad[4]= vsad_intra16_mmx; c->nsse[0] = nsse16_mmx; @@ -1165,10 +1165,13 @@ void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) if (bit_depth <= 8) c->get_pixels = get_pixels_sse2; c->sum_abs_dctelem= sum_abs_dctelem_sse2; -#if HAVE_YASM && HAVE_ALIGNED_STACK +#if HAVE_YASM + c->sse[0] = ff_sse16_sse2; +#if HAVE_ALIGNED_STACK c->hadamard8_diff[0]= ff_hadamard8_diff16_sse2; c->hadamard8_diff[1]= ff_hadamard8_diff_sse2; #endif +#endif } #if HAVE_SSSE3 |