aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-01-20 06:01:54 +0000
committerMåns Rullgård <mans@mansr.com>2010-01-20 06:01:54 +0000
commit5e7dfb7de11dab3cbf8663d4fcb682935bd3a80b (patch)
tree13de579124ef323ace42fec078a1f6b9c611be57 /libavutil
parentbec358d683954738488a7ea529a340e9b11931ef (diff)
downloadffmpeg-5e7dfb7de11dab3cbf8663d4fcb682935bd3a80b.tar.gz
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 Originally committed as revision 21346 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/internal.h19
1 files changed, 0 insertions, 19 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h
index ac7f1523e6..f0ea232ae6 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -156,25 +156,6 @@ static inline av_const unsigned int ff_sqrt(unsigned int a)
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