[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec dsputil.h,1.119,1.120
Diego Biurrun CVS
diego
Tue Sep 20 01:26:49 CEST 2005
Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv29028/libavcodec
Modified Files:
dsputil.h
Log Message:
Move lrintf implementation from libavcodec/dsputil.h to libavutil/common.h
where it makes more sense.
Index: dsputil.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/dsputil.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- dsputil.h 28 Jun 2005 22:46:36 -0000 1.119
+++ dsputil.h 19 Sep 2005 23:26:47 -0000 1.120
@@ -594,33 +594,4 @@
return score;\
}
-#ifndef HAVE_LRINTF
-/* XXX: add ISOC specific test to avoid specific BSD testing. */
-/* better than nothing implementation. */
-/* btw, rintf() is existing on fbsd too -- alex */
-static always_inline long int lrintf(float x)
-{
-#ifdef CONFIG_WIN32
-# ifdef ARCH_X86
- int32_t i;
- asm volatile(
- "fistpl %0\n\t"
- : "=m" (i) : "t" (x) : "st"
- );
- return i;
-# else
- /* XXX: incorrect, but make it compile */
- return (int)(x + (x < 0 ? -0.5 : 0.5));
-# endif
-#else
- return (int)(rint(x));
-#endif
-}
-#else
-#ifndef _ISOC9X_SOURCE
-#define _ISOC9X_SOURCE
-#endif
-#include <math.h>
-#endif
-
#endif
More information about the ffmpeg-cvslog
mailing list