Hardcode register to prevent aparent miscompilation.

[ffmpeg] / libavcodec / mathops.h

diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index db39dedd1ce228fe26f5d02c395944b8f80e1dd1..65918ad96ceb04d0622aeb67c016f9e6d1d3fee2 100644 (file)
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -19,10 +19,12 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#ifndef MATHOPS_H
-#define MATHOPS_H
+#ifndef FFMPEG_MATHOPS_H
+#define FFMPEG_MATHOPS_H
 
-#ifdef ARCH_X86
+#include "common.h"
+
+#ifdef ARCH_X86_32
 
 #include "i386/mathops.h"
 
@@ -30,10 +32,14 @@
 
 #include "armv4l/mathops.h"
 
-#elif defined(ARCH_PPC)
+#elif defined(ARCH_POWERPC)
 
 #include "ppc/mathops.h"
 
+#elif defined(ARCH_BFIN)
+
+#include "bfin/mathops.h"
+
 #endif
 
 /* generic implementation */
@@ -46,7 +52,7 @@
 //gcc 3.4 creates an incredibly bloated mess out of this
 //#    define MULH(a,b) (((int64_t)(a) * (int64_t)(b))>>32)
 
-static always_inline int MULH(int a, int b){
+static av_always_inline int MULH(int a, int b){
     return ((int64_t)(a) * (int64_t)(b))>>32;
 }
 #endif
@@ -65,5 +71,5 @@ static always_inline int MULH(int a, int b){
 #   define MUL16(ra, rb) ((ra) * (rb))
 #endif
 
-#endif //MATHOPS_H
+#endif /* FFMPEG_MATHOPS_H */