Replace i2f(0) by the actual thing done, gcc is not an optimizing compiler.

[ffmpeg] / libavcodec / rectangle.h

diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h
index 4dd9028f18c04a0843fbdece97a4cc170bdfee6f..b2452abb2d8995c60c29a24cf1885336cb5515c7 100644 (file)
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@ -28,7 +28,7 @@
 #ifndef FFMPEG_RECTANGLE_H
 #define FFMPEG_RECTANGLE_H
 
-#include "common.h"
+#include "libavutil/common.h"
 
 /**
  * fill a rectangle.
@@ -64,7 +64,7 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride,
         *(uint32_t*)(p + 3*stride)= v;
     }else if(w==8){
     //gcc can't optimize 64bit math on x86_32
-#if defined(ARCH_X86_64) || (defined(MP_WORDSIZE) && MP_WORDSIZE >= 64)
+#ifdef HAVE_FAST_64BIT
         const uint64_t v= val*0x0100000001ULL;
         *(uint64_t*)(p + 0*stride)= v;
         if(h==1) return;