# HG changeset patch # User mru # Date 1263967314 0 # Node ID bcebfe1a7e80af36689b99c4e3048bf482d0a4f6 # Parent d87093e4b925215bec533f1ecbeaefd4b0d80c69 Move COPY3_IF_LT to lavc/mathops.h This obscure macro is only used in motion_est.c so having it in lavc makes more sense. See discussion here: http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2008-November/056561.html diff -r d87093e4b925 -r bcebfe1a7e80 internal.h --- a/internal.h Tue Jan 19 23:25:36 2010 +0000 +++ b/internal.h Wed Jan 20 06:01:54 2010 +0000 @@ -156,25 +156,6 @@ level = (level ^ mask) - mask; #endif -#if HAVE_CMOV -#define COPY3_IF_LT(x, y, a, b, c, d)\ -__asm__ volatile(\ - "cmpl %0, %3 \n\t"\ - "cmovl %3, %0 \n\t"\ - "cmovl %4, %1 \n\t"\ - "cmovl %5, %2 \n\t"\ - : "+&r" (x), "+&r" (a), "+r" (c)\ - : "r" (y), "r" (b), "r" (d)\ -); -#else -#define COPY3_IF_LT(x, y, a, b, c, d)\ -if ((y) < (x)) {\ - (x) = (y);\ - (a) = (b);\ - (c) = (d);\ -} -#endif - /* avoid usage of dangerous/inappropriate system functions */ #undef malloc #define malloc please_use_av_malloc