diff options
| author | James Almer <jamrial@gmail.com> | 2017-01-31 15:08:19 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-01-31 15:08:19 -0300 |
| commit | ac774cfa571734c49c26e2d3387adccff8957ff8 (patch) | |
| tree | 92011adfe335fe1160bb26b159fd1510d96458f1 /libavcodec/x86/h264_qpel.c | |
| parent | a956164e1eb3418922cae949f02ad4035f013213 (diff) | |
| parent | 4efab89332ea39a77145e8b15562b981d9dbde68 (diff) | |
| download | ffmpeg-ac774cfa571734c49c26e2d3387adccff8957ff8.tar.gz | |
Merge commit '4efab89332ea39a77145e8b15562b981d9dbde68'
* commit '4efab89332ea39a77145e8b15562b981d9dbde68':
x86: Use *_FAST/*_SLOW CPU feature detection macros where appropriate
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/x86/h264_qpel.c')
| -rw-r--r-- | libavcodec/x86/h264_qpel.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c index 8c4b1e1288..96fa4a706a 100644 --- a/libavcodec/x86/h264_qpel.c +++ b/libavcodec/x86/h264_qpel.c @@ -562,11 +562,6 @@ av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth) } if (EXTERNAL_SSE2(cpu_flags)) { - if (!(cpu_flags & AV_CPU_FLAG_SSE2SLOW) && !high_bit_depth) { - // these functions are slower than mmx on AMD, but faster on Intel - H264_QPEL_FUNCS(0, 0, sse2); - } - if (!high_bit_depth) { H264_QPEL_FUNCS(0, 1, sse2); H264_QPEL_FUNCS(0, 2, sse2); @@ -593,6 +588,12 @@ av_cold void ff_h264qpel_init_x86(H264QpelContext *c, int bit_depth) } } + if (EXTERNAL_SSE2_FAST(cpu_flags)) { + if (!high_bit_depth) { + H264_QPEL_FUNCS(0, 0, sse2); + } + } + if (EXTERNAL_SSSE3(cpu_flags)) { if (!high_bit_depth) { H264_QPEL_FUNCS(1, 0, ssse3); |