From f6878753fbd0d509134ac24c0e9f404ac74fc4fe Mon Sep 17 00:00:00 2001 From: nick Date: Sun, 3 Mar 2002 18:47:29 +0000 Subject: [PATCH] 're-include' possibility git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4934 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demuxer.h | 4 ++++ libmpdemux/stheader.h | 5 +++++ libvo/video_out.h | 4 ++++ mp_image.h | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index f2bbb9b5bb..6d20bd34a7 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -1,3 +1,5 @@ +#ifndef __DEMUXER_H +#define __DEMUXER_H 1 #define MAX_PACKS 4096 #define MAX_PACK_BYTES 0x800000 @@ -190,3 +192,5 @@ extern int pts_from_bps; int demux_info_add(demuxer_t *demuxer, char *opt, char *param); char* demux_info_get(demuxer_t *demuxer, char *opt); int demux_info_print(demuxer_t *demuxer); + +#endif diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index c8c3d1fdcb..62955d68ff 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -1,3 +1,6 @@ +#ifndef __ST_HEADER_H +#define __ST_HEADER_H 1 + // Stream headers: #include "wine/mmreg.h" @@ -79,3 +82,5 @@ sh_video_t* new_sh_video(demuxer_t *demuxer,int id); int video_read_properties(sh_video_t *sh_video); int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps); + +#endif diff --git a/libvo/video_out.h b/libvo/video_out.h index 1a461430da..3982cc8648 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -5,6 +5,9 @@ * Strongly modified, most parts rewritten: A'rpi/ESP-team - 2000-2001 * */ + +#ifndef __VIDEO_OUT_H +#define __VIDEO_OUT_H 1 #include #include @@ -202,3 +205,4 @@ extern float vo_fps; extern char *vo_subdevice; +#endif diff --git a/mp_image.h b/mp_image.h index 72a2e73511..543149df86 100644 --- a/mp_image.h +++ b/mp_image.h @@ -1,3 +1,5 @@ +#ifndef __MP_IMAGE_H +#define __MP_IMAGE_H 1 // set if buffer content shouldn't be modified: #define MP_IMGFLAG_PRESERVE 0x01 @@ -87,3 +89,5 @@ static inline mp_image_t* new_mp_image(int w,int h){ mpi->height=mpi->h=h; return mpi; } + +#endif