Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

[ffmpeg.git] / libavutil / arm / intmath.h

diff --git a/libavutil/arm/intmath.h b/libavutil/arm/intmath.h
index 0ab0d4c..0980a6f 100644 (file)
--- a/libavutil/arm/intmath.h
+++ b/libavutil/arm/intmath.h
@@ -30,19 +30,6 @@
 
 #if HAVE_ARMV6
 
 
 #if HAVE_ARMV6
 

-#define FASTDIV FASTDIV
-static av_always_inline av_const int FASTDIV(int a, int b)
-{
-    int r;
-    __asm__ ("cmp     %2, #2               \n\t"
-             "ldr     %0, [%3, %2, lsl #2] \n\t"
-             "ite     le                   \n\t"
-             "lsrle   %0, %1, #1           \n\t"
-             "smmulgt %0, %0, %1           \n\t"
-             : "=&r"(r) : "r"(a), "r"(b), "r"(ff_inverse) : "cc");
-    return r;
-}
-

 #define av_clip_uint8 av_clip_uint8_arm
 static av_always_inline av_const unsigned av_clip_uint8_arm(int a)
 {
 #define av_clip_uint8 av_clip_uint8_arm
 static av_always_inline av_const unsigned av_clip_uint8_arm(int a)
 {


@@ -99,17 +86,6 @@ static av_always_inline int av_sat_dadd32_arm(int a, int b)
     return r;
 }
 
     return r;
 }
 

-#else /* HAVE_ARMV6 */
-
-#define FASTDIV FASTDIV
-static av_always_inline av_const int FASTDIV(int a, int b)
-{
-    int r, t;
-    __asm__ ("umull %1, %0, %2, %3"
-             : "=&r"(r), "=&r"(t) : "r"(a), "r"(ff_inverse[b]));
-    return r;
-}
-

 #endif /* HAVE_ARMV6 */
 
 #if HAVE_ASM_MOD_Q
 #endif /* HAVE_ARMV6 */
 
 #if HAVE_ASM_MOD_Q