diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 00:44:18 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-01 00:44:18 +0400 |
commit | 64b25938e90253432d28ffd7d971f085c560a523 (patch) | |
tree | 56ba6a39d7e8f14ebccdcc4db935164b5da624a2 /libavcodec/x86/vc1dsp_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/vc1dsp_mmx.c')
-rw-r--r-- | libavcodec/x86/vc1dsp_mmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/vc1dsp_mmx.c b/libavcodec/x86/vc1dsp_mmx.c index 4adeabca3b..bddac5ec77 100644 --- a/libavcodec/x86/vc1dsp_mmx.c +++ b/libavcodec/x86/vc1dsp_mmx.c @@ -809,7 +809,7 @@ void ff_vc1dsp_init_mmx(VC1DSPContext *dsp) #if HAVE_YASM if (mm_flags & AV_CPU_FLAG_MMX) { } - return; + if (mm_flags & AV_CPU_FLAG_MMX2) { ASSIGN_LF(mmx2); } |