Merge commit '48aef27f'

* commit '48aef27f':
  x86: Put COPY3_IF_LT under HAVE_6REGS

Conflicts:
	libavcodec/x86/mathops.h

See: b38910c9Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/x86/mathops.h

@@ -23,6 +23,7 @@
 #define AVCODEC_X86_MATHOPS_H
 
 #include "config.h"
+
 #include "libavutil/common.h"
 #include "libavutil/x86/asm.h"
 
@@ -100,6 +101,7 @@ __asm__ volatile(\
     : "r" (y), "r" (b), "r" (d)\
 );
 #endif /* HAVE_6REGS */
+
 #endif /* HAVE_I686 */
 
 #define MASK_ABS(mask, level)                   \