summaryrefslogtreecommitdiff
path: root/libavcodec/x86/lpc.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2013-08-20 14:46:58 +0200
committerDiego Biurrun <diego@biurrun.de>2013-08-29 13:07:37 +0200
commit6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0 (patch)
tree24a69c3793e5791b75d5e7b421583ddfda1f7b44 /libavcodec/x86/lpc.c
parent79aec43ce813a3e270743ca64fa3f31fa43df80b (diff)
x86: avcodec: Use convenience macros to check for CPU flags
Diffstat (limited to 'libavcodec/x86/lpc.c')
-rw-r--r--libavcodec/x86/lpc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/x86/lpc.c b/libavcodec/x86/lpc.c
index aa36bc121c..12245c4298 100644
--- a/libavcodec/x86/lpc.c
+++ b/libavcodec/x86/lpc.c
@@ -19,11 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavutil/x86/asm.h"
#include "libavutil/attributes.h"
#include "libavutil/cpu.h"
#include "libavutil/internal.h"
#include "libavutil/mem.h"
+#include "libavutil/x86/asm.h"
+#include "libavutil/x86/cpu.h"
#include "libavcodec/lpc.h"
DECLARE_ASM_CONST(16, double, pd_1)[2] = { 1.0, 1.0 };
@@ -151,7 +152,7 @@ av_cold void ff_lpc_init_x86(LPCContext *c)
#if HAVE_SSE2_INLINE
int cpu_flags = av_get_cpu_flags();
- if (cpu_flags & (AV_CPU_FLAG_SSE2 | AV_CPU_FLAG_SSE2SLOW)) {
+ if (INLINE_SSE2(cpu_flags) && (cpu_flags & AV_CPU_FLAG_SSE2SLOW)) {
c->lpc_apply_welch_window = lpc_apply_welch_window_sse2;
c->lpc_compute_autocorr = lpc_compute_autocorr_sse2;
}