From 2b6af2000b421057a3194a962a9ab6be39d0a838 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 1 Jan 2008 21:35:58 +0000
Subject: Add multiple inclusion guards to all header files that lack them.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25581 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/jpeg_enc.h           | 4 ++++
 libvo/osd_font.h           | 5 +++++
 libvo/video_out_internal.h | 6 ++++--
 libvo/videodev_mjpeg.h     | 5 +++++
 libvo/w32_common.h         | 5 +++++
 5 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'libvo')

diff --git a/libvo/jpeg_enc.h b/libvo/jpeg_enc.h
index 2c04cc0847..923b431a9b 100644
--- a/libvo/jpeg_enc.h
+++ b/libvo/jpeg_enc.h
@@ -22,6 +22,8 @@
  * http://www.ece.purdue.edu/~bourman/grad-labs/lab8/pdf/lab.pdf
  */
 
+#ifndef JPEG_ENC_H
+#define JPEG_ENC_H
 
 typedef struct {
 	struct MpegEncContext *s;
@@ -43,3 +45,5 @@ int jpeg_enc_frame(jpeg_enc_t *j, unsigned char *y_data,
 		unsigned char *u_data, unsigned char *v_data, char *bufr);
 
 void jpeg_enc_uninit(jpeg_enc_t *j);
+
+#endif /* JPEG_ENC_H */
diff --git a/libvo/osd_font.h b/libvo/osd_font.h
index cf69ebc5b3..1ba24e9056 100644
--- a/libvo/osd_font.h
+++ b/libvo/osd_font.h
@@ -1,3 +1,6 @@
+#ifndef OSD_FONT_H
+#define OSD_FONT_H
+
 const unsigned char osd_font_pfb[] = {
 0x80,0x01,0x02,0x17,0x00,0x00,0x25,0x21,0x50,0x53,0x2d,0x41,0x64,0x6f,0x62,0x65,
 0x46,0x6f,0x6e,0x74,0x2d,0x31,0x2e,0x30,0x3a,0x20,0x4f,0x53,0x44,0x20,0x31,0x2e,
@@ -520,3 +523,5 @@ const unsigned char osd_font_pfb[] = {
 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,
 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x0a,
 0x80,0x03,};
+
+#endif /* OSD_FONT_H */
diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h
index 58329dfdee..5d51909b95 100644
--- a/libvo/video_out_internal.h
+++ b/libvo/video_out_internal.h
@@ -20,6 +20,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#ifndef VIDEO_OUT_INTERNAL_H
+#define VIDEO_OUT_INTERNAL_H
+
 /* All video drivers will want this */
 #include "libmpcodecs/vfcap.h"
 #include "libmpcodecs/mp_image.h"
@@ -54,5 +57,4 @@ static int preinit(const char *);
 
 #include "osd.h"
 
-
-
+#endif /* VIDEO_OUT_INTERNAL_H */
diff --git a/libvo/videodev_mjpeg.h b/libvo/videodev_mjpeg.h
index 68fd79c576..9f8c30234c 100644
--- a/libvo/videodev_mjpeg.h
+++ b/libvo/videodev_mjpeg.h
@@ -3,6 +3,9 @@
    <rainer@johanni.de>
 */
 
+#ifndef VIDEODEV_MJPEG_H
+#define VIDEODEV_MJPEG_H
+
 /* This is identical with the mgavideo internal params struct, 
    please tell me if you change this struct here ! <gz@lysator.liu.se) */
 struct mjpeg_params
@@ -116,3 +119,5 @@ Private IOCTL to set up for displaying MJPEG
 #define MJPIOC_QBUF_PLAY      _IOW ('v', BASE_VIDIOCPRIVATE+4,  int)
 #define MJPIOC_SYNC           _IOR ('v', BASE_VIDIOCPRIVATE+5,  struct mjpeg_sync)
 #define MJPIOC_G_STATUS       _IOWR('v', BASE_VIDIOCPRIVATE+6,  struct mjpeg_status)
+
+#endif /* VIDEODEV_MJPEG_H */
diff --git a/libvo/w32_common.h b/libvo/w32_common.h
index 6d657d6b88..1dcb3e8b88 100644
--- a/libvo/w32_common.h
+++ b/libvo/w32_common.h
@@ -1,3 +1,6 @@
+#ifndef W32COMMON_H
+#define W32COMMON_H
+
 extern int vo_depthonscreen;
 extern int vo_screenwidth;
 extern int vo_screenheight;
@@ -17,3 +20,5 @@ extern int vo_w32_check_events(void);
 extern int vo_w32_config(uint32_t, uint32_t, uint32_t);
 extern void destroyRenderingContext(void);
 extern void w32_update_xinerama_info(void);
+
+#endif /* W32COMMON_H */
-- 
cgit v1.2.3