summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-01 21:35:58 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-01 21:35:58 +0000
commit2b6af2000b421057a3194a962a9ab6be39d0a838 (patch)
treece97430e57ac21374317f279f22f1b85e4f49689 /libmpcodecs
parent4a78a92dd6f8532451fb1797bb48e915ca638d99 (diff)
downloadmpv-2b6af2000b421057a3194a962a9ab6be39d0a838.tar.bz2
mpv-2b6af2000b421057a3194a962a9ab6be39d0a838.tar.xz
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
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/ad.h3
-rw-r--r--libmpcodecs/ad_internal.h3
-rw-r--r--libmpcodecs/dec_audio.h4
-rw-r--r--libmpcodecs/dec_video.h4
-rw-r--r--libmpcodecs/pullup.h5
-rw-r--r--libmpcodecs/vd.h4
-rw-r--r--libmpcodecs/vd_internal.h3
-rw-r--r--libmpcodecs/vf.h4
-rw-r--r--libmpcodecs/vf_scale.h5
-rw-r--r--libmpcodecs/vfcap.h5
10 files changed, 38 insertions, 2 deletions
diff --git a/libmpcodecs/ad.h b/libmpcodecs/ad.h
index d15cdb5b96..d9178a85c2 100644
--- a/libmpcodecs/ad.h
+++ b/libmpcodecs/ad.h
@@ -1,3 +1,5 @@
+#ifndef AD_H
+#define AD_H
#include "mpc_info.h"
typedef mp_codec_info_t ad_info_t;
@@ -28,3 +30,4 @@ extern ad_functions_t* mpcodecs_ad_drivers[];
// fallback: use hw mixer in libao
#define ADCTRL_SET_VOLUME 4 /* set volume (used for mp3lib and liba52) */
+#endif /* AD_H */
diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h
index 5dd3122d96..c7a2457535 100644
--- a/libmpcodecs/ad_internal.h
+++ b/libmpcodecs/ad_internal.h
@@ -1,3 +1,5 @@
+#ifndef AD_INTERNAL_H
+#define AD_INTERNAL_H
#include "codec-cfg.h"
#include "libaf/af_format.h"
@@ -24,3 +26,4 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buffer,int minlen,int maxl
decode_audio\
};
+#endif /* AD_INTERNAL_H */
diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h
index 37b3c27db7..0c325ced62 100644
--- a/libmpcodecs/dec_audio.h
+++ b/libmpcodecs/dec_audio.h
@@ -1,3 +1,5 @@
+#ifndef DEC_AUDIO_H
+#define DEC_AUDIO_H
// dec_audio.c:
extern void afm_help(void);
@@ -9,3 +11,5 @@ extern void uninit_audio(sh_audio_t *sh_audio);
extern int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
int *out_samplerate, int *out_channels, int *out_format);
+
+#endif /* DEC_AUDIO_H */
diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h
index cb5ac8b651..7e73133144 100644
--- a/libmpcodecs/dec_video.h
+++ b/libmpcodecs/dec_video.h
@@ -1,3 +1,5 @@
+#ifndef DEC_VIDEO_H
+#define DEC_VIDEO_H
// dec_video.c:
extern void vfm_help(void);
@@ -18,3 +20,5 @@ extern void resync_video_stream(sh_video_t *sh_video);
extern int get_current_video_decoder_lag(sh_video_t *sh_video);
extern int divx_quality;
+
+#endif /* DEC_VIDEO_H */
diff --git a/libmpcodecs/pullup.h b/libmpcodecs/pullup.h
index 2f5b119949..04a2f95bb7 100644
--- a/libmpcodecs/pullup.h
+++ b/libmpcodecs/pullup.h
@@ -1,4 +1,5 @@
-
+#ifndef PULLUP_H
+#define PULLUP_H
#define PULLUP_CPU_MMX 1
#define PULLUP_CPU_MMX2 2
@@ -80,4 +81,4 @@ void pullup_preinit_context(struct pullup_context *c);
void pullup_init_context(struct pullup_context *c);
void pullup_free_context(struct pullup_context *c);
-
+#endif /* PULLUP_H */
diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h
index d660ff84fd..c37c0e40cf 100644
--- a/libmpcodecs/vd.h
+++ b/libmpcodecs/vd.h
@@ -1,3 +1,5 @@
+#ifndef VD_H
+#define VD_H
#include "mp_image.h"
#include "mpc_info.h"
@@ -32,3 +34,5 @@ mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, i
void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w,int h, int x, int y);
#define VDFLAGS_DROPFRAME 3
+
+#endif /* VD_H */
diff --git a/libmpcodecs/vd_internal.h b/libmpcodecs/vd_internal.h
index 57aede310b..f83913473b 100644
--- a/libmpcodecs/vd_internal.h
+++ b/libmpcodecs/vd_internal.h
@@ -1,3 +1,5 @@
+#ifndef VD_INTERNAL
+#define VD_INTERNAL
#include "codec-cfg.h"
#include "img_format.h"
@@ -25,3 +27,4 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags);
decode\
};
+#endif /* VD_INTERNAL */
diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
index 9a72aa0b3d..d4451f4b5b 100644
--- a/libmpcodecs/vf.h
+++ b/libmpcodecs/vf.h
@@ -1,3 +1,5 @@
+#ifndef VF_H
+#define VF_H
struct vf_instance_s;
struct vf_priv_s;
@@ -120,3 +122,5 @@ void vf_uninit_filter_chain(vf_instance_t* vf);
int vf_config_wrapper(struct vf_instance_s* vf,
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt);
+
+#endif /* VF_H */
diff --git a/libmpcodecs/vf_scale.h b/libmpcodecs/vf_scale.h
index 5b6db0a06e..18c1f3af1f 100644
--- a/libmpcodecs/vf_scale.h
+++ b/libmpcodecs/vf_scale.h
@@ -1,4 +1,9 @@
//GPL
+#ifndef VF_SCALE_H
+#define VF_SCALE_H
+
int get_sws_cpuflags(void);
struct SwsContext *sws_getContextFromCmdLine(int srcW, int srcH, int srcFormat, int dstW, int dstH, int dstFormat);
+
+#endif /* VF_SCALE_H */
diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h
index 0cc9c4ec4d..88a2c8737b 100644
--- a/libmpcodecs/vfcap.h
+++ b/libmpcodecs/vfcap.h
@@ -1,5 +1,8 @@
// VFCAP_* values: they are flags, returned by query_format():
+#ifndef VFCAP_H
+#define VFCAP_H
+
// set, if the given colorspace is supported (with or without conversion)
#define VFCAP_CSP_SUPPORTED 0x1
// set, if the given colorspace is supported _without_ conversion
@@ -30,3 +33,5 @@
#define VFCAP_EOSD 0x2000
// filter will draw EOSD at screen resolution (without scaling)
#define VFCAP_EOSD_UNSCALED 0x4000
+
+#endif /* VFCAP_H */