Commit 014f9c8e authored by Loren Merritt's avatar Loren Merritt Committed by Fiona Glaser

Fix "--asm avx"

Previously required "--asm sse2fast,fastshuffle,sse4.2,avx".
parent 3674cf4f
......@@ -596,6 +596,10 @@ int x264_param_parse( x264_param_t *p, const char *name, const char *value )
b_error = 1;
}
free( buf );
if( p->cpu & X264_CPU_SSSE3 )
p->cpu |= X264_CPU_SSE2_IS_FAST;
if( p->cpu & X264_CPU_SSE4 )
p->cpu |= X264_CPU_SHUFFLE_IS_FAST;
}
}
OPT("threads")
......
......@@ -59,8 +59,9 @@ const x264_cpu_name_t x264_cpu_names[] =
{"SSSE3", X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3},
{"FastShuffle", X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SHUFFLE_IS_FAST},
{"SSE4.1", X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3|X264_CPU_SSE4},
{"SSE4", X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3|X264_CPU_SSE4},
{"SSE4.2", X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3|X264_CPU_SSE4|X264_CPU_SSE42},
{"AVX", X264_CPU_AVX},
{"AVX", X264_CPU_MMX|X264_CPU_MMXEXT|X264_CPU_SSE|X264_CPU_SSE2|X264_CPU_SSE3|X264_CPU_SSSE3|X264_CPU_SSE4|X264_CPU_SSE42|X264_CPU_AVX},
{"Cache32", X264_CPU_CACHELINE_32},
{"Cache64", X264_CPU_CACHELINE_64},
{"SSEMisalign", X264_CPU_SSE_MISALIGN},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment