cosmetics: comment spelling/grammar fixes

[ffmpeg] / libavcodec / mathops.h

diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 69ed017637666844ea7a2c17c623f37bf07954dd..3b9bfeb09f18cafc0c4361c4da0e6fc894e7aca9 100644 (file)
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -3,24 +3,28 @@
  * Copyright (c) 2001, 2002 Fabrice Bellard.
  * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at> et al
  *
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * 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
+
+#include "libavutil/common.h"
 
-#ifdef ARCH_X86
+#ifdef ARCH_X86_32
 
 #include "i386/mathops.h"
 
@@ -28,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 */
@@ -44,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
@@ -53,6 +61,14 @@ static always_inline int MULH(int a, int b){
 #   define MUL64(a,b) ((int64_t)(a) * (int64_t)(b))
 #endif
 
+#ifndef MAC64
+#   define MAC64(d, a, b) ((d) += MUL64(a, b))
+#endif
+
+#ifndef MLS64
+#   define MLS64(d, a, b) ((d) -= MUL64(a, b))
+#endif
+
 /* signed 16x16 -> 32 multiply add accumulate */
 #ifndef MAC16
 #   define MAC16(rt, ra, rb) rt += (ra) * (rb)
@@ -63,5 +79,9 @@ static always_inline int MULH(int a, int b){
 #   define MUL16(ra, rb) ((ra) * (rb))
 #endif
 
-#endif //MATHOPS_H
+#ifndef MLS16
+#   define MLS16(rt, ra, rb) ((rt) -= (ra) * (rb))
+#endif
+
+#endif /* FFMPEG_MATHOPS_H */