From 31b2c1446f7cc7c10f217093f695edfc1b1be498 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 17 Oct 2007 09:31:06 +0000
Subject: [PATCH] Add missing multiple inclusion guards.

Originally committed as revision 10763 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/armv4l/dsputil_iwmmxt_rnd.h | 5 +++++
 libavcodec/bfin/config_bfin.h          | 5 +++++
 libavcodec/colorspace.h                | 4 ++++
 libavcodec/i386/dsputil_mmx_avg.h      | 5 +++++
 libavcodec/i386/dsputil_mmx_qns.h      | 4 ++++
 libavcodec/i386/dsputil_mmx_rnd.h      | 5 ++++-
 6 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/libavcodec/armv4l/dsputil_iwmmxt_rnd.h b/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
index 51ba61c47a..a753b43533 100644
--- a/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
+++ b/libavcodec/armv4l/dsputil_iwmmxt_rnd.h
@@ -19,6 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef FFMPEG_DSPUTIL_IWMMXT_RND_H
+#define FFMPEG_DSPUTIL_IWMMXT_RND_H
+
 void DEF(put, pixels8)(uint8_t *block, const uint8_t *pixels, const int line_size, int h)
 {
     int stride = line_size;
@@ -1112,3 +1115,5 @@ void DEF(avg, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, const int lin
         : [line_size]"r"(line_size)
         : "r12", "memory");
 }
+
+#endif /* FFMPEG_DSPUTIL_IWMMXT_RND_H */
diff --git a/libavcodec/bfin/config_bfin.h b/libavcodec/bfin/config_bfin.h
index eac2e1e2e7..85b478fb08 100644
--- a/libavcodec/bfin/config_bfin.h
+++ b/libavcodec/bfin/config_bfin.h
@@ -29,6 +29,10 @@ DEFUN(put_pixels_clamped,mL1,
 
       rts;
 */
+
+#ifndef FFMPEG_CONFIG_BFIN_H
+#define FFMPEG_CONFIG_BFIN_H
+
 #ifndef DEFUN
 
 #ifndef mL1
@@ -49,3 +53,4 @@ DEFUN(put_pixels_clamped,mL1,
 
 #endif
 
+#endif /* FFMPEG_CONFIG_BFIN_H */
diff --git a/libavcodec/colorspace.h b/libavcodec/colorspace.h
index 7d0a6274ba..9d89d6daa4 100644
--- a/libavcodec/colorspace.h
+++ b/libavcodec/colorspace.h
@@ -24,6 +24,9 @@
  * Various defines for YUV<->RGB conversion
  */
 
+#ifndef FFMPEG_COLORSPACE_H
+#define FFMPEG_COLORSPACE_H
+
 #define SCALEBITS 10
 #define ONE_HALF  (1 << (SCALEBITS - 1))
 #define FIX(x)    ((int) ((x) * (1<<SCALEBITS) + 0.5))
@@ -105,3 +108,4 @@ static inline int C_JPEG_TO_CCIR(int y) {
 (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 -           \
    FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128)
 
+#endif /* FFMPEG_COLORSPACE_H */
diff --git a/libavcodec/i386/dsputil_mmx_avg.h b/libavcodec/i386/dsputil_mmx_avg.h
index d37d300646..63c714a144 100644
--- a/libavcodec/i386/dsputil_mmx_avg.h
+++ b/libavcodec/i386/dsputil_mmx_avg.h
@@ -24,6 +24,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef FFMPEG_DSPUTIL_MMX_AVG_H
+#define FFMPEG_DSPUTIL_MMX_AVG_H
+
 /* XXX: we use explicit registers to avoid a gcc 2.95.2 register asm
    clobber bug - now it will work with 2.95.2 and also with -fPIC
  */
@@ -869,3 +872,5 @@ QPEL_2TAP_L3(avg_)
 QPEL_2TAP_L3(put_)
 #undef STORE_OP
 #undef QPEL_2TAP_L3
+
+#endif /* FFMPEG_DSPUTIL_MMX_AVG_H */
diff --git a/libavcodec/i386/dsputil_mmx_qns.h b/libavcodec/i386/dsputil_mmx_qns.h
index 06bcb6d7ba..1f8c27bfe8 100644
--- a/libavcodec/i386/dsputil_mmx_qns.h
+++ b/libavcodec/i386/dsputil_mmx_qns.h
@@ -22,6 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef FFMPEG_DSPUTIL_MMX_QNS_H
+#define FFMPEG_DSPUTIL_MMX_QNS_H
+
 #define MAX_ABS (512 >> (SCALE_OFFSET>0 ? SCALE_OFFSET : 0))
 
 static int DEF(try_8x8basis)(int16_t rem[64], int16_t weight[64], int16_t basis[64], int scale)
@@ -100,3 +103,4 @@ static void DEF(add_8x8basis)(int16_t rem[64], int16_t basis[64], int scale)
     }
 }
 
+#endif /* FFMPEG_DSPUTIL_MMX_QNS_H */
diff --git a/libavcodec/i386/dsputil_mmx_rnd.h b/libavcodec/i386/dsputil_mmx_rnd.h
index 601800a9e0..2b28fd4568 100644
--- a/libavcodec/i386/dsputil_mmx_rnd.h
+++ b/libavcodec/i386/dsputil_mmx_rnd.h
@@ -24,6 +24,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef FFMPEG_DSPUTIL_MMX_RND_H
+#define FFMPEG_DSPUTIL_MMX_RND_H
+
 // put_pixels
 static void DEF(put, pixels8_x2)(uint8_t *block, const uint8_t *pixels, int line_size, int h)
 {
@@ -589,4 +592,4 @@ static void DEF(avg, pixels16_xy2)(uint8_t *block, const uint8_t *pixels, int li
     DEF(avg, pixels8_xy2)(block+8, pixels+8, line_size, h);
 }
 
-
+#endif /* FFMPEG_DSPUTIL_MMX_RND_H */