summaryrefslogtreecommitdiffstats
path: root/libmpdemux
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 /libmpdemux
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 'libmpdemux')
-rw-r--r--libmpdemux/demux_avs.h5
-rw-r--r--libmpdemux/mp3_hdr.h4
-rw-r--r--libmpdemux/mpeg_hdr.h4
-rw-r--r--libmpdemux/muxer.h4
-rw-r--r--libmpdemux/nuppelvideo.h4
-rw-r--r--libmpdemux/parse_es.h3
6 files changed, 24 insertions, 0 deletions
diff --git a/libmpdemux/demux_avs.h b/libmpdemux/demux_avs.h
index 11e94dd798..b45f8cc575 100644
--- a/libmpdemux/demux_avs.h
+++ b/libmpdemux/demux_avs.h
@@ -21,6 +21,9 @@
* Boston, MA 02110-1301 USA.
*/
+#ifndef DEMUX_AVS_H
+#define DEMUX_AVS_H
+
enum { AVISYNTH_INTERFACE_VERSION = 2 };
enum
@@ -162,3 +165,5 @@ static inline int avs_bits_per_pixel(const AVS_VideoInfo * p)
default: return 0;
}
}
+
+#endif /* DEMUX_AVS_H */
diff --git a/libmpdemux/mp3_hdr.h b/libmpdemux/mp3_hdr.h
index 6cddf0d816..8133b5ed29 100644
--- a/libmpdemux/mp3_hdr.h
+++ b/libmpdemux/mp3_hdr.h
@@ -1,3 +1,5 @@
+#ifndef MP3_HDR_H
+#define MP3_HDR_H
int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* freq, int* spf, int* mpa_layer, int* br);
@@ -9,3 +11,5 @@ static inline int mp_check_mp3_header(unsigned int head){
if(mp_decode_mp3_header((unsigned char*)(&head))<=0) return 0;
return 1;
}
+
+#endif /* MP3_HDR_H */
diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h
index b5a189c5a5..31ac33378c 100644
--- a/libmpdemux/mpeg_hdr.h
+++ b/libmpdemux/mpeg_hdr.h
@@ -1,3 +1,5 @@
+#ifndef MPEG_HDR_H
+#define MPEG_HDR_H
typedef struct {
// video info:
@@ -27,3 +29,5 @@ int mp4_header_process_vol(mp_mpeg_header_t * picture, unsigned char * buffer);
void mp4_header_process_vop(mp_mpeg_header_t * picture, unsigned char * buffer);
int h264_parse_sps(mp_mpeg_header_t * picture, unsigned char * buf, int len);
int mp_vc1_decode_sequence_header(mp_mpeg_header_t * picture, unsigned char * buf, int len);
+
+#endif /* MPEG_HDR_H */
diff --git a/libmpdemux/muxer.h b/libmpdemux/muxer.h
index 9839eaa338..a01206af44 100644
--- a/libmpdemux/muxer.h
+++ b/libmpdemux/muxer.h
@@ -1,3 +1,5 @@
+#ifndef MUXER_H
+#define MUXER_H
#define MUXER_MAX_STREAMS 16
@@ -113,3 +115,5 @@ int muxer_init_muxer_mpeg(muxer_t *);
int muxer_init_muxer_rawvideo(muxer_t *);
int muxer_init_muxer_lavf(muxer_t *);
int muxer_init_muxer_rawaudio(muxer_t *);
+
+#endif /* MUXER_H */
diff --git a/libmpdemux/nuppelvideo.h b/libmpdemux/nuppelvideo.h
index 14e72b9581..f1b81cced5 100644
--- a/libmpdemux/nuppelvideo.h
+++ b/libmpdemux/nuppelvideo.h
@@ -1,5 +1,8 @@
/* nuppelvideo.h rh */
+#ifndef NUPPELVIDEO_H
+#define NUPPELVIDEO_H
+
#include "libavutil/intfloat_readwrite.h"
typedef struct __attribute__((packed)) rtfileheader
@@ -156,3 +159,4 @@ typedef struct audbuffertype
(h)->lavc_maxqdiff = le2me_32((h)->lavc_maxqdiff); \
}
+#endif /* NUPPELVIDEO_H */
diff --git a/libmpdemux/parse_es.h b/libmpdemux/parse_es.h
index 45936b396a..fceed0c895 100644
--- a/libmpdemux/parse_es.h
+++ b/libmpdemux/parse_es.h
@@ -1,3 +1,5 @@
+#ifndef PARSE_ES_H
+#define PARSE_ES_H
#define MAX_VIDEO_PACKET_SIZE (224*1024+4)
#define VIDEOBUFFER_SIZE 0x100000
@@ -16,3 +18,4 @@ int read_video_packet(demux_stream_t *ds);
// return: next packet code
int skip_video_packet(demux_stream_t *ds);
+#endif /* PARSE_ES_H */