From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 26 Mar 2014 11:41:26 +0000 (-0700)
Subject: x86: h264_qpel: Simplify an #if conditional
X-Git-Tag: v11_alpha1~685
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2c5be57494e6117086771bca34c8cd4c72c8e99;p=platform%2Fupstream%2Flibav.git

x86: h264_qpel: Simplify an #if conditional

The extra conditions are covered by previous #ifs and conditional compilation.
---

diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index b285c1f..8793b5d 100644
--- a/libavcodec/x86/h264_qpel.c
+++ b/libavcodec/x86/h264_qpel.c
@@ -497,7 +497,7 @@ QPEL16_OP(mc31, MMX)\
 QPEL16_OP(mc32, MMX)\
 QPEL16_OP(mc33, MMX)
 
-#if ARCH_X86_32 && HAVE_YASM && CONFIG_H264QPEL // ARCH_X86_64 implies SSE2+
+#if ARCH_X86_32 // ARCH_X86_64 implies SSE2+
 QPEL16(mmxext)
 #endif