[SCM] libav/experimental: x86: h264_qpel: Simplify an #if conditional

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c2c5be57494e6117086771bca34c8cd4c72c8e99
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Mar 26 04:41:26 2014 -0700

    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
 

-- 
Libav/FFmpeg packaging