summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-22 09:09:46 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-22 09:09:46 +0000
commit8efb2fa21c81f99b37795621f9ec2bc125c6ced0 (patch)
tree9a6f354228affe704b16844775070159e82b5fcd
parent50899e9083661200d9bb105dca0339c14e56d271 (diff)
downloadmpv-8efb2fa21c81f99b37795621f9ec2bc125c6ced0.tar.bz2
mpv-8efb2fa21c81f99b37795621f9ec2bc125c6ced0.tar.xz
Add MPLAYER_ prefix to multiple inclusion guards.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--access_mpcontext.h6
-rw-r--r--asxparser.h6
-rw-r--r--cfg-mencoder.h6
-rw-r--r--cfg-mplayer.h6
-rw-r--r--codec-cfg.h6
-rw-r--r--command.h6
-rw-r--r--cpudetect.h6
-rw-r--r--cputable.h6
-rw-r--r--drivers/generic_math.h6
-rw-r--r--drivers/mga_vid.h6
-rw-r--r--drivers/radeon.h6
-rw-r--r--drivers/radeon_vid.h6
-rw-r--r--drivers/tdfx_vid.h6
-rw-r--r--edl.h6
-rw-r--r--fmt-conversion.h6
-rw-r--r--get_path.h6
-rw-r--r--gui/app.h7
-rw-r--r--gui/bitmap.h6
-rw-r--r--gui/cfg.h7
-rw-r--r--gui/interface.h7
-rw-r--r--gui/mplayer/gmplayer.h7
-rw-r--r--gui/mplayer/gtk/about.h7
-rw-r--r--gui/mplayer/gtk/eq.h7
-rw-r--r--gui/mplayer/gtk/fs.h6
-rw-r--r--gui/mplayer/gtk/gtk_common.h7
-rw-r--r--gui/mplayer/gtk/mb.h7
-rw-r--r--gui/mplayer/gtk/menu.h6
-rw-r--r--gui/mplayer/gtk/opts.h7
-rw-r--r--gui/mplayer/gtk/pl.h7
-rw-r--r--gui/mplayer/gtk/sb.h6
-rw-r--r--gui/mplayer/gtk/url.h7
-rw-r--r--gui/mplayer/gui_common.h7
-rw-r--r--gui/mplayer/play.h7
-rw-r--r--gui/mplayer/widgets.h7
-rw-r--r--gui/skin/cut.h7
-rw-r--r--gui/skin/font.h7
-rw-r--r--gui/skin/skin.h7
-rw-r--r--gui/win32/dialogs.h6
-rw-r--r--gui/win32/gui.h6
-rw-r--r--gui/win32/playlist.h6
-rw-r--r--gui/win32/skinload.h6
-rw-r--r--gui/win32/wincfg.h6
-rw-r--r--gui/wm/ws.h6
-rw-r--r--gui/wm/wskeys.h7
-rw-r--r--gui/wm/wsmkeys.h6
-rw-r--r--gui/wm/wsxdnd.h7
-rw-r--r--input/ar.h6
-rw-r--r--input/input.h6
-rw-r--r--input/joystick.h6
-rw-r--r--input/lirc.h6
-rw-r--r--input/mouse.h6
-rw-r--r--libaf/af.h6
-rw-r--r--libaf/af_format.h7
-rw-r--r--libaf/af_hrtf.h6
-rw-r--r--libaf/af_mp.h6
-rw-r--r--libaf/control.h6
-rw-r--r--libaf/dsp.h6
-rw-r--r--libaf/equalizer.h6
-rw-r--r--libaf/filter.h8
-rw-r--r--libaf/reorder_ch.h6
-rw-r--r--libaf/window.h8
-rw-r--r--libao2/audio_out.h7
-rw-r--r--libao2/audio_out_internal.h6
-rw-r--r--libmenu/menu.h6
-rw-r--r--libmenu/menu_list.h6
-rw-r--r--libmpcodecs/ad.h6
-rw-r--r--libmpcodecs/ad_internal.h6
-rw-r--r--libmpcodecs/ae.h7
-rw-r--r--libmpcodecs/ae_faac.h6
-rw-r--r--libmpcodecs/ae_lame.h6
-rw-r--r--libmpcodecs/ae_lavc.h6
-rw-r--r--libmpcodecs/ae_pcm.h6
-rw-r--r--libmpcodecs/ae_toolame.h6
-rw-r--r--libmpcodecs/ae_twolame.h6
-rw-r--r--libmpcodecs/cmmx.h6
-rw-r--r--libmpcodecs/dec_audio.h6
-rw-r--r--libmpcodecs/dec_video.h6
-rw-r--r--libmpcodecs/img_format.h7
-rw-r--r--libmpcodecs/mp_image.h6
-rw-r--r--libmpcodecs/mpc_info.h6
-rw-r--r--libmpcodecs/native/alaw.h6
-rw-r--r--libmpcodecs/native/mmx.h6
-rw-r--r--libmpcodecs/native/xa_gsm.h6
-rw-r--r--libmpcodecs/native/xa_gsm_int.h6
-rw-r--r--libmpcodecs/pullup.h6
-rw-r--r--libmpcodecs/vd.h6
-rw-r--r--libmpcodecs/vd_internal.h6
-rw-r--r--libmpcodecs/vf.h6
-rw-r--r--libmpcodecs/vf_scale.h6
-rw-r--r--libmpcodecs/vfcap.h6
-rw-r--r--libmpcodecs/vqf.h6
-rw-r--r--libmpdemux/asf.h6
-rw-r--r--libmpdemux/aviheader.h6
-rw-r--r--libmpdemux/demux_avs.h6
-rw-r--r--libmpdemux/demux_rtp.h6
-rw-r--r--libmpdemux/demux_rtp_internal.h6
-rw-r--r--libmpdemux/demux_xmms_plugin.h6
-rw-r--r--libmpdemux/demuxer.h6
-rw-r--r--libmpdemux/ebml.h6
-rw-r--r--libmpdemux/genres.h8
-rw-r--r--libmpdemux/matroska.h6
-rw-r--r--libmpdemux/mf.h6
-rw-r--r--libmpdemux/mp3_hdr.h6
-rw-r--r--libmpdemux/mpeg_hdr.h6
-rw-r--r--libmpdemux/mpeg_packetizer.h6
-rw-r--r--libmpdemux/ms_hdr.h6
-rw-r--r--libmpdemux/muxer.h6
-rw-r--r--libmpdemux/nuppelvideo.h6
-rw-r--r--libmpdemux/parse_es.h6
-rw-r--r--libmpdemux/parse_mp4.h6
-rw-r--r--libmpdemux/qtpalette.h6
-rw-r--r--libmpdemux/stheader.h6
-rw-r--r--libmpdemux/yuv4mpeg.h6
-rw-r--r--libmpdemux/yuv4mpeg_intern.h6
-rw-r--r--libvo/aspect.h6
-rw-r--r--libvo/fastmemcpy.h6
-rw-r--r--libvo/font_load.h6
-rw-r--r--libvo/geometry.h6
-rw-r--r--libvo/gl_common.h6
-rw-r--r--libvo/gtf.h6
-rw-r--r--libvo/jpeg_enc.h6
-rw-r--r--libvo/osd_font.h6
-rw-r--r--libvo/spuenc.h6
-rw-r--r--libvo/vesa_lvo.h6
-rw-r--r--libvo/video_out.h6
-rw-r--r--libvo/video_out_internal.h6
-rw-r--r--libvo/videodev_mjpeg.h6
-rw-r--r--libvo/vo_quartz.h6
-rw-r--r--libvo/vosub_vidix.h6
-rw-r--r--libvo/w32_common.h6
-rw-r--r--libvo/wskeys.h6
-rw-r--r--libvo/x11_common.h7
-rw-r--r--m_config.h6
-rw-r--r--m_option.h6
-rw-r--r--m_property.h6
-rw-r--r--m_struct.h6
-rw-r--r--mangle.h6
-rw-r--r--metadata.h6
-rw-r--r--mp_core.h6
-rw-r--r--mp_fifo.h6
-rw-r--r--mp_msg.h7
-rw-r--r--mp_osd.h6
-rw-r--r--mpbswap.h6
-rw-r--r--mpcommon.h6
-rw-r--r--mplayer.h6
-rw-r--r--osdep/getch2.h6
-rw-r--r--osdep/glob.h6
-rw-r--r--osdep/keycodes.h6
-rw-r--r--osdep/mmap_anon.h6
-rw-r--r--osdep/shmem.h6
-rw-r--r--parser-cfg.h6
-rw-r--r--parser-mecmd.h6
-rw-r--r--parser-mpcmd.h6
-rw-r--r--playtree.h9
-rw-r--r--playtreeparser.h9
-rw-r--r--stream/audio_in.h6
-rw-r--r--stream/cache2.h6
-rw-r--r--stream/cdd.h6
-rw-r--r--stream/cookies.h6
-rw-r--r--stream/dvbin.h6
-rw-r--r--stream/frequencies.h6
-rw-r--r--stream/http.h6
-rw-r--r--stream/librtsp/rtsp.h6
-rw-r--r--stream/librtsp/rtsp_rtp.h6
-rw-r--r--stream/librtsp/rtsp_session.h6
-rw-r--r--stream/netstream.h6
-rw-r--r--stream/network.h6
-rw-r--r--stream/pnm.h6
-rw-r--r--stream/pvr.h6
-rw-r--r--stream/realrtsp/asmrp.h6
-rw-r--r--stream/realrtsp/real.h6
-rw-r--r--stream/realrtsp/rmff.h9
-rw-r--r--stream/realrtsp/sdpplin.h8
-rw-r--r--stream/realrtsp/xbuffer.h7
-rw-r--r--stream/rtp.h6
-rw-r--r--stream/stream.h6
-rw-r--r--stream/stream_dvd.h6
-rw-r--r--stream/stream_dvd_common.h6
-rw-r--r--stream/stream_radio.h6
-rw-r--r--stream/tcp.h6
-rw-r--r--stream/tv.h6
-rw-r--r--stream/tvi_def.h6
-rw-r--r--stream/tvi_dshow.h6
-rw-r--r--stream/udp.h6
-rw-r--r--stream/url.h6
-rw-r--r--stream/vcd_read.h6
-rw-r--r--stream/vcd_read_darwin.h6
-rw-r--r--stream/vcd_read_fbsd.h6
-rw-r--r--stream/vcd_read_win32.h6
-rw-r--r--sub_cc.h6
-rw-r--r--subopt-helper.h6
-rw-r--r--unrar_exec.h6
-rw-r--r--xvid_vbr.h6
-rw-r--r--xvmc_render.h6
194 files changed, 589 insertions, 618 deletions
diff --git a/access_mpcontext.h b/access_mpcontext.h
index a4878b2d9b..c975a90fe6 100644
--- a/access_mpcontext.h
+++ b/access_mpcontext.h
@@ -1,5 +1,5 @@
-#ifndef ACCESS_MPCONTEXT_H
-#define ACCESS_MPCONTEXT_H
+#ifndef MPLAYER_ACCESS_MPCONTEXT_H
+#define MPLAYER_ACCESS_MPCONTEXT_H
struct MPContext;
const void *mpctx_get_video_out(struct MPContext *mpctx);
@@ -10,4 +10,4 @@ void *mpctx_get_mixer(struct MPContext *mpctx);
int mpctx_get_global_sub_size(struct MPContext *mpctx);
int mpctx_get_osd_function(struct MPContext *mpctx);
-#endif /* ACCESS_MPCONTEXT_H */
+#endif /* MPLAYER_ACCESS_MPCONTEXT_H */
diff --git a/asxparser.h b/asxparser.h
index e6bad13851..2d9b860707 100644
--- a/asxparser.h
+++ b/asxparser.h
@@ -1,5 +1,5 @@
-#ifndef ASXPARSER_H
-#define ASXPARSER_H
+#ifndef MPLAYER_ASXPARSER_H
+#define MPLAYER_ASXPARSER_H
typedef struct ASX_Parser_t ASX_Parser_t;
@@ -49,4 +49,4 @@ typedef void (*ASX_FreeFunc)(void* arg);
void
asx_list_free(void* list_ptr,ASX_FreeFunc free_func);
-#endif /* ASXPARSER_H */
+#endif /* MPLAYER_ASXPARSER_H */
diff --git a/cfg-mencoder.h b/cfg-mencoder.h
index aebfc74825..8847e0f0d6 100644
--- a/cfg-mencoder.h
+++ b/cfg-mencoder.h
@@ -1,5 +1,5 @@
-#ifndef CFG_MENCODER_H
-#define CFG_MENCODER_H
+#ifndef MPLAYER_CFG_MENCODER_H
+#define MPLAYER_CFG_MENCODER_H
/*
* config for cfgparser
@@ -268,4 +268,4 @@ const m_option_t mencoder_opts[]={
{NULL, NULL, 0, 0, 0, 0, NULL}
};
-#endif /* CFG_MENCODER.H */
+#endif /* MPLAYER_CFG_MENCODER_H */
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index 7d157f0bf7..2bb8f5852b 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -1,5 +1,5 @@
-#ifndef CFG_MPLAYER_H
-#define CFG_MPLAYER_H
+#ifndef MPLAYER_CFG_MPLAYER_H
+#define MPLAYER_CFG_MPLAYER_H
/*
* config for cfgparser
@@ -368,5 +368,5 @@ const m_option_t mplayer_opts[]={
{NULL, NULL, 0, 0, 0, 0, NULL}
};
-#endif /* CFG_MPLAYER_H */
+#endif /* MPLAYER_CFG_MPLAYER_H */
diff --git a/codec-cfg.h b/codec-cfg.h
index 4f6705bef2..dca75c3bbf 100644
--- a/codec-cfg.h
+++ b/codec-cfg.h
@@ -1,5 +1,5 @@
-#ifndef CODEC_CFG_H
-#define CODEC_CFG_H
+#ifndef MPLAYER_CODEC_CFG_H
+#define MPLAYER_CODEC_CFG_H
#define CODEC_CFG_MIN 20070407
@@ -73,4 +73,4 @@ void stringset_free(stringset_t *set);
void stringset_add(stringset_t *set, const char *str);
int stringset_test(stringset_t *set, const char *str);
-#endif /* CODEC_CFG_H */
+#endif /* MPLAYER_CODEC_CFG_H */
diff --git a/command.h b/command.h
index 5e0e69334d..c57f81e17c 100644
--- a/command.h
+++ b/command.h
@@ -1,8 +1,8 @@
-#ifndef COMMAND_H
-#define COMMAND_H
+#ifndef MPLAYER_COMMAND_H
+#define MPLAYER_COMMAND_H
int run_command(struct MPContext *mpctx, mp_cmd_t *cmd);
char *property_expand_string(struct MPContext *mpctx, char *str);
void property_print_help(void);
-#endif /* COMMAND_H */
+#endif /* MPLAYER_COMMAND_H */
diff --git a/cpudetect.h b/cpudetect.h
index eab872bbdc..6c48da0bef 100644
--- a/cpudetect.h
+++ b/cpudetect.h
@@ -1,5 +1,5 @@
-#ifndef CPUDETECT_H
-#define CPUDETECT_H
+#ifndef MPLAYER_CPUDETECT_H
+#define MPLAYER_CPUDETECT_H
#define CPUTYPE_I386 3
#define CPUTYPE_I486 4
@@ -57,4 +57,4 @@ void GetCpuCaps(CpuCaps *caps);
/* returned value is malloc()'ed so free() it after use */
char *GetCpuFriendlyName(unsigned int regs[], unsigned int regs2[]);
-#endif /* CPUDETECT_H */
+#endif /* MPLAYER_CPUDETECT_H */
diff --git a/cputable.h b/cputable.h
index 26eb56f781..ef3496e1fb 100644
--- a/cputable.h
+++ b/cputable.h
@@ -4,8 +4,8 @@
* Family F codenames owe much thanks to Neil Phillips, author of x86test.
*/
-#ifndef CPUTABLE_H
-#define CPUTABLE_H
+#ifndef MPLAYER_CPUTABLE_H
+#define MPLAYER_CPUTABLE_H
#define MAX_VENDORS 8 /* Number of CPU Vendors */
@@ -529,4 +529,4 @@ static const struct {
{"GenuineTMx86","Transmeta"}
};
-#endif /* CPUTABLE_H */
+#endif /* MPLAYER_CPUTABLE_H */
diff --git a/drivers/generic_math.h b/drivers/generic_math.h
index 6471d034c2..f606cce3d8 100644
--- a/drivers/generic_math.h
+++ b/drivers/generic_math.h
@@ -19,8 +19,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef GENERIC_MATH_H
-#define GENERIC_MATH_H
+#ifndef MPLAYER_GENERIC_MATH_H
+#define MPLAYER_GENERIC_MATH_H
typedef struct gen_sincos
{
@@ -269,4 +269,4 @@ static double inline gen_cos(double x)
#undef cos
#define cos(x) gen_cos(x)
-#endif /* GENERIC_MATH_H */
+#endif /* MPLAYER_GENERIC_MATH_H */
diff --git a/drivers/mga_vid.h b/drivers/mga_vid.h
index d29fcf7591..0ae31486a6 100644
--- a/drivers/mga_vid.h
+++ b/drivers/mga_vid.h
@@ -21,8 +21,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef MGA_VID_H
-#define MGA_VID_H
+#ifndef MPLAYER_MGA_VID_H
+#define MPLAYER_MGA_VID_H
typedef struct mga_vid_config_s
{
@@ -65,4 +65,4 @@ uint32_t num_frames;
#define MGA_VID_VERSION 0x0201
-#endif /* MGA_VID_H */
+#endif /* MPLAYER_MGA_VID_H */
diff --git a/drivers/radeon.h b/drivers/radeon.h
index 8e95e46d97..0293981e6f 100644
--- a/drivers/radeon.h
+++ b/drivers/radeon.h
@@ -20,8 +20,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef RADEON_H
-#define RADEON_H
+#ifndef MPLAYER_RADEON_H
+#define MPLAYER_RADEON_H
/* radeon PCI ids */
@@ -2055,4 +2055,4 @@
/* End of field default values. */
-#endif /* RADEON_H */
+#endif /* MPLAYER_RADEON_H */
diff --git a/drivers/radeon_vid.h b/drivers/radeon_vid.h
index c90842d498..c397dc6022 100644
--- a/drivers/radeon_vid.h
+++ b/drivers/radeon_vid.h
@@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef RADEON_VID_H
-#define RADEON_VID_H
+#ifndef MPLAYER_RADEON_VID_H
+#define MPLAYER_RADEON_VID_H
typedef struct mga_vid_config_s
{
@@ -123,4 +123,4 @@ uint32_t num_frames;
#define MGA_VID_VERSION 0x0201
-#endif /* RADEON_VID_H */
+#endif /* MPLAYER_RADEON_VID_H */
diff --git a/drivers/tdfx_vid.h b/drivers/tdfx_vid.h
index 05d775b061..4860431193 100644
--- a/drivers/tdfx_vid.h
+++ b/drivers/tdfx_vid.h
@@ -18,8 +18,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef TDFX_VID_H
-#define TDFX_VID_H
+#ifndef MPLAYER_TDFX_VID_H
+#define MPLAYER_TDFX_VID_H
#define TDFX_VID_VERSION 1
@@ -125,4 +125,4 @@ typedef struct tdfx_vid_overlay_s {
#define TDFX_VID_OVERLAY_ON _IO ('J', 8)
#define TDFX_VID_OVERLAY_OFF _IO ('J', 9)
-#endif /* TDFX_VID_H */
+#endif /* MPLAYER_TDFX_VID_H */
diff --git a/edl.h b/edl.h
index f68307c318..8c21a34173 100644
--- a/edl.h
+++ b/edl.h
@@ -1,7 +1,7 @@
// EDL version 0.6
-#ifndef EDL_H
-#define EDL_H
+#ifndef MPLAYER_EDL_H
+#define MPLAYER_EDL_H
#define EDL_SKIP 0
#define EDL_MUTE 1
@@ -26,4 +26,4 @@ extern char *edl_output_filename; // file to put EDL entries in (-edlout)
void free_edl(edl_record_ptr next_edl_record); // free's entire EDL list.
edl_record_ptr edl_parse_file(void); // fills EDL stack
-#endif /* EDL_H */
+#endif /* MPLAYER_EDL_H */
diff --git a/fmt-conversion.h b/fmt-conversion.h
index a0619c5a55..adbf7a028b 100644
--- a/fmt-conversion.h
+++ b/fmt-conversion.h
@@ -1,5 +1,5 @@
-#ifndef FMT_CONVERSION_H
-#define FMT_CONVERSION_H
+#ifndef MPLAYER_FMT_CONVERSION_H
+#define MPLAYER_FMT_CONVERSION_H
#ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/avutil.h>
@@ -73,4 +73,4 @@ enum PixelFormat imgfmt2pixfmt(int fmt)
return PIX_FMT_NONE;
}
-#endif /* FMT_CONVERSION_H */
+#endif /* MPLAYER_FMT_CONVERSION_H */
diff --git a/get_path.h b/get_path.h
index 0a62d938a6..df81c48fd9 100644
--- a/get_path.h
+++ b/get_path.h
@@ -18,10 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GET_PATH_H
-#define GET_PATH_H
+#ifndef MPLAYER_GET_PATH_H
+#define MPLAYER_GET_PATH_H
char *get_path(const char *filename);
void set_path_env();
-#endif /* GET_PATH_H */
+#endif /* MPLAYER_GET_PATH_H */
diff --git a/gui/app.h b/gui/app.h
index 1d00f20636..5e5874c5b4 100644
--- a/gui/app.h
+++ b/gui/app.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_APP_H
-#define GUI_APP_H
+#ifndef MPLAYER_GUI_APP_H
+#define MPLAYER_GUI_APP_H
#include "bitmap.h"
#include "wm/ws.h"
@@ -184,4 +183,4 @@ extern void btnModify( int event,float state );
extern float btnGetValue( int event );
extern void btnSet( int event,int set );
-#endif /* GUI_APP_H */
+#endif /* MPLAYER_GUI_APP_H */
diff --git a/gui/bitmap.h b/gui/bitmap.h
index 06194514e0..af3ef8c7b0 100644
--- a/gui/bitmap.h
+++ b/gui/bitmap.h
@@ -1,5 +1,5 @@
-#ifndef GUI_BITMAP_H
-#define GUI_BITMAP_H
+#ifndef MPLAYER_GUI_BITMAP_H
+#define MPLAYER_GUI_BITMAP_H
typedef struct txSample
{
@@ -13,4 +13,4 @@ typedef struct txSample
int bpRead( char * fname, txSample * bf );
void Convert32to1( txSample * in,txSample * out,int adaptivlimit );
-#endif /* GUI_BITMAP_H */
+#endif /* MPLAYER_GUI_BITMAP_H */
diff --git a/gui/cfg.h b/gui/cfg.h
index aba1b9f298..97f0cb3f82 100644
--- a/gui/cfg.h
+++ b/gui/cfg.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_CFG_H
-#define GUI_CFG_H
+#ifndef MPLAYER_GUI_CFG_H
+#define MPLAYER_GUI_CFG_H
extern int gtkEnableAudioEqualizer;
@@ -59,4 +58,4 @@ extern gtkASS_t gtkASS;
extern int cfg_read( void );
extern int cfg_write( void );
-#endif /* GUI_CFG_H */
+#endif /* MPLAYER_GUI_CFG_H */
diff --git a/gui/interface.h b/gui/interface.h
index 1217d1e479..f3b4781ad2 100644
--- a/gui/interface.h
+++ b/gui/interface.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_INTERFACE_H
-#define GUI_INTERFACE_H
+#ifndef MPLAYER_GUI_INTERFACE_H
+#define MPLAYER_GUI_INTERFACE_H
#include "../config.h"
#include "mplayer/play.h"
@@ -223,4 +222,4 @@ extern char * gstrchr( char * str,int c );
sprintf( s,"%s/%s",d,n ); \
}
-#endif /* GUI_INTERFACE_H */
+#endif /* MPLAYER_GUI_INTERFACE_H */
diff --git a/gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h
index e0d9c9b6a0..35bed406a7 100644
--- a/gui/mplayer/gmplayer.h
+++ b/gui/mplayer/gmplayer.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_GMPLAYER_H
-#define GUI_GMPLAYER_H
+#ifndef MPLAYER_GUI_GMPLAYER_H
+#define MPLAYER_GUI_GMPLAYER_H
extern int mplSubRender;
extern int mplMainRender;
@@ -31,4 +30,4 @@ extern void mplMenuMouseHandle( int X,int Y,int RX,int RY );
extern void mplPBInit( void );
extern void mplPBShow( int x, int y );
-#endif /* GUI_GMPLAYER_H */
+#endif /* MPLAYER_GUI_GMPLAYER_H */
diff --git a/gui/mplayer/gtk/about.h b/gui/mplayer/gtk/about.h
index 9b8337c53e..155f71566e 100644
--- a/gui/mplayer/gtk/about.h
+++ b/gui/mplayer/gtk/about.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_ABOUT_H
-#define GUI_ABOUT_H
+#ifndef MPLAYER_GUI_ABOUT_H
+#define MPLAYER_GUI_ABOUT_H
#include <gtk/gtk.h>
@@ -9,4 +8,4 @@ extern GtkWidget * About;
extern GtkWidget * create_About( void );
extern void ShowAboutBox( void );
-#endif /* GUI_ABOUT_H */
+#endif /* MPLAYER_GUI_ABOUT_H */
diff --git a/gui/mplayer/gtk/eq.h b/gui/mplayer/gtk/eq.h
index 093bce8092..d99cbb7785 100644
--- a/gui/mplayer/gtk/eq.h
+++ b/gui/mplayer/gtk/eq.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_EQ_H
-#define GUI_EQ_H
+#ifndef MPLAYER_GUI_EQ_H
+#define MPLAYER_GUI_EQ_H
#include <gtk/gtk.h>
@@ -9,4 +8,4 @@ extern GtkWidget * Equalizer;
extern GtkWidget * create_Equalizer( void );
extern void ShowEqualizer( void );
-#endif /* GUI_EQ_H */
+#endif /* MPLAYER_GUI_EQ_H */
diff --git a/gui/mplayer/gtk/fs.h b/gui/mplayer/gtk/fs.h
index 31e9a54d5d..5e38da023f 100644
--- a/gui/mplayer/gtk/fs.h
+++ b/gui/mplayer/gtk/fs.h
@@ -1,5 +1,5 @@
-#ifndef GUI_FS_H
-#define GUI_FS_H
+#ifndef MPLAYER_GUI_FS_H
+#define MPLAYER_GUI_FS_H
#include <gtk/gtk.h>
@@ -18,4 +18,4 @@ extern void ShowFileSelect( int type, int modal );
extern GtkWidget * create_FileSelect( void );
-#endif /* GUI_FS_H */
+#endif /* MPLAYER_GUI_FS_H */
diff --git a/gui/mplayer/gtk/gtk_common.h b/gui/mplayer/gtk/gtk_common.h
index e358a7c30d..fb3619f9a8 100644
--- a/gui/mplayer/gtk/gtk_common.h
+++ b/gui/mplayer/gtk/gtk_common.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_GTK_COMMON_H
-#define GUI_GTK_COMMON_H
+#ifndef MPLAYER_GUI_GTK_COMMON_H
+#define MPLAYER_GUI_GTK_COMMON_H
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
@@ -21,4 +20,4 @@ extern GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit
extern GtkWidget * AddComboBox( GtkWidget * parent );
extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer );
-#endif /* GUI_GTK_COMMON_H */
+#endif /* MPLAYER_GUI_GTK_COMMON_H */
diff --git a/gui/mplayer/gtk/mb.h b/gui/mplayer/gtk/mb.h
index f77dfb35ae..adb90f1dbc 100644
--- a/gui/mplayer/gtk/mb.h
+++ b/gui/mplayer/gtk/mb.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_MB_H
-#define GUI_MB_H
+#ifndef MPLAYER_GUI_MB_H
+#define MPLAYER_GUI_MB_H
#include <gtk/gtk.h>
@@ -9,4 +8,4 @@ extern GtkWidget * MessageBox;
extern GtkWidget * create_MessageBox( int type );
extern void ShowMessageBox( const char * msg );
-#endif /* GUI_MB_H */
+#endif /* MPLAYER_GUI_MB_H */
diff --git a/gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/menu.h
index 8e272ba0df..f82eeff01f 100644
--- a/gui/mplayer/gtk/menu.h
+++ b/gui/mplayer/gtk/menu.h
@@ -1,5 +1,5 @@
-#ifndef GUI_MENU_H
-#define GUI_MENU_H
+#ifndef MPLAYER_GUI_MENU_H
+#define MPLAYER_GUI_MENU_H
#include <gtk/gtk.h>
@@ -10,4 +10,4 @@ extern GtkWidget * AddSubMenu( GtkWidget *window1, const char * immagine_xpm, Gt
extern GtkWidget * AddSeparator( GtkWidget * Menu );
extern GtkWidget * create_PopUpMenu( void );
-#endif /* GUI_MENU_H */
+#endif /* MPLAYER_GUI_MENU_H */
diff --git a/gui/mplayer/gtk/opts.h b/gui/mplayer/gtk/opts.h
index 93ace3af3f..9cff8a3d62 100644
--- a/gui/mplayer/gtk/opts.h
+++ b/gui/mplayer/gtk/opts.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_OPTS_H
-#define GUI_OPTS_H
+#ifndef MPLAYER_GUI_OPTS_H
+#define MPLAYER_GUI_OPTS_H
#include <gtk/gtk.h>
@@ -13,4 +12,4 @@ extern GtkWidget * create_AudioConfig( void );
extern void ShowPreferences( void );
-#endif /* GUI_OPTS_H */
+#endif /* MPLAYER_GUI_OPTS_H */
diff --git a/gui/mplayer/gtk/pl.h b/gui/mplayer/gtk/pl.h
index 5d6780c0b8..9c82b730f9 100644
--- a/gui/mplayer/gtk/pl.h
+++ b/gui/mplayer/gtk/pl.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_PL_H
-#define GUI_PL_H
+#ifndef MPLAYER_GUI_PL_H
+#define MPLAYER_GUI_PL_H
#include <gtk/gtk.h>
@@ -9,4 +8,4 @@ extern void HidePlayList( void );
extern GtkWidget * create_PlayList (void);
-#endif /* GUI_PL_H */
+#endif /* MPLAYER_GUI_PL_H */
diff --git a/gui/mplayer/gtk/sb.h b/gui/mplayer/gtk/sb.h
index a1a7e3775d..d26b75c4d5 100644
--- a/gui/mplayer/gtk/sb.h
+++ b/gui/mplayer/gtk/sb.h
@@ -1,5 +1,5 @@
-#ifndef GUI_SB_H
-#define GUI_SB_H
+#ifndef MPLAYER_GUI_SB_H
+#define MPLAYER_GUI_SB_H
#include <gtk/gtk.h>
@@ -9,4 +9,4 @@ extern GtkWidget * SkinBrowser;
extern void ShowSkinBrowser( void );
extern GtkWidget * create_SkinBrowser( void );
-#endif /* GUI_SB_H */
+#endif /* MPLAYER_GUI_SB_H */
diff --git a/gui/mplayer/gtk/url.h b/gui/mplayer/gtk/url.h
index 93d37a20db..1fca6a1fb9 100644
--- a/gui/mplayer/gtk/url.h
+++ b/gui/mplayer/gtk/url.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_URL_H
-#define GUI_URL_H
+#ifndef MPLAYER_GUI_URL_H
+#define MPLAYER_GUI_URL_H
extern GtkWidget * URL;
extern int gtkVURLDialogBox;
@@ -8,4 +7,4 @@ extern int gtkVURLDialogBox;
extern void ShowURLDialogBox( void );
extern GtkWidget * create_URL( void );
-#endif /* GUI_URL_H */
+#endif /* MPLAYER_GUI_URL_H */
diff --git a/gui/mplayer/gui_common.h b/gui/mplayer/gui_common.h
index 2aec358480..441b3455dc 100644
--- a/gui/mplayer/gui_common.h
+++ b/gui/mplayer/gui_common.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_GUI_COMMON_H
-#define GUI_GUI_COMMON_H
+#ifndef MPLAYER_GUI_GUI_COMMON_H
+#define MPLAYER_GUI_GUI_COMMON_H
#include <stdlib.h>
#include <stdio.h>
@@ -18,4 +17,4 @@ extern void PutImage( txSample * bf,int x,int y,int max,int ofs );
extern void SimplePotmeterPutImage( txSample * bf,int x,int y,float frac );
extern void Render( wsTWindow * window,wItem * Items,int nrItems,char * db,int size );
-#endif /* GUI_GUI_COMMON_H */
+#endif /* MPLAYER_GUI_GUI_COMMON_H */
diff --git a/gui/mplayer/play.h b/gui/mplayer/play.h
index 2e545bc3e3..13cdc72e56 100644
--- a/gui/mplayer/play.h
+++ b/gui/mplayer/play.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_PLAY_H
-#define GUI_PLAY_H
+#ifndef MPLAYER_GUI_PLAY_H
+#define MPLAYER_GUI_PLAY_H
#include "../config.h"
@@ -31,4 +30,4 @@ extern void EventHandling( void );
extern void mplSetFileName( char * dir,char * name,int type );
-#endif /* GUI_PLAY_H */
+#endif /* MPLAYER_GUI_PLAY_H */
diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h
index 255737c74f..b6135f35ac 100644
--- a/gui/mplayer/widgets.h
+++ b/gui/mplayer/widgets.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_WIDGETS_H
-#define GUI_WIDGETS_H
+#ifndef MPLAYER_GUI_WIDGETS_H
+#define MPLAYER_GUI_WIDGETS_H
#include <stdio.h>
#include <stdlib.h>
@@ -60,4 +59,4 @@ extern void gtkMessageBox( int type,const gchar * str );
extern void gtkSetLayer( GtkWidget * wdg );
extern void gtkActive( GtkWidget * wdg );
-#endif /* GUI_WIDGETS_H */
+#endif /* MPLAYER_GUI_WIDGETS_H */
diff --git a/gui/skin/cut.h b/gui/skin/cut.h
index 66ac10abef..04352e979e 100644
--- a/gui/skin/cut.h
+++ b/gui/skin/cut.h
@@ -1,10 +1,9 @@
-
-#ifndef GUI_CUT_H
-#define GUI_CUT_H
+#ifndef MPLAYER_GUI_CUT_H
+#define MPLAYER_GUI_CUT_H
extern void cutItem( char * in,char * out,char sep,int num );
extern int cutItemToInt( char * in,char sep,int num );
extern float cutItemToFloat( char * in,char sep,int num );
extern void cutChunk( char * in,char * s1 );
-#endif /* GUI_CUT_H */
+#endif /* MPLAYER_GUI_CUT_H */
diff --git a/gui/skin/font.h b/gui/skin/font.h
index 1392febb5a..caeac4c597 100644
--- a/gui/skin/font.h
+++ b/gui/skin/font.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_FONT_H
-#define GUI_FONT_H
+#ifndef MPLAYER_GUI_FONT_H
+#define MPLAYER_GUI_FONT_H
#include "bitmap.h"
#include "app.h"
@@ -34,4 +33,4 @@ extern int fntTextWidth( int id,char * str );
extern int fntRead( char * path,char * fname );
extern txSample * fntRender( wItem * item,int px,const char * fmt,... );
-#endif /* GUI_FONT_H */
+#endif /* MPLAYER_GUI_FONT_H */
diff --git a/gui/skin/skin.h b/gui/skin/skin.h
index a1540ecd07..0411b27e13 100644
--- a/gui/skin/skin.h
+++ b/gui/skin/skin.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_SKIN_H
-#define GUI_SKIN_H
+#ifndef MPLAYER_GUI_SKIN_H
+#define MPLAYER_GUI_SKIN_H
#include "app.h"
@@ -15,4 +14,4 @@ extern char * trimleft( char * in );
extern char * strswap( char * in,char what,char whereof );
extern char * trim( char * in );
-#endif /* GUI_SKIN_H */
+#endif /* MPLAYER_GUI_SKIN_H */
diff --git a/gui/win32/dialogs.h b/gui/win32/dialogs.h
index d0b52a4965..8ca7ff982d 100644
--- a/gui/win32/dialogs.h
+++ b/gui/win32/dialogs.h
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GUI_DIALOGS_H
-#define GUI_DIALOGS_H
+#ifndef MPLAYER_GUI_DIALOGS_H
+#define MPLAYER_GUI_DIALOGS_H
#define TBS_TOOLTIPS 0x0100
#define WM_SYSTRAY (WM_USER+1)
@@ -131,4 +131,4 @@
#define GTK_MB_WARNING 0x4
#define GTK_MB_SIMPLE 0x8
-#endif /* GUI_DIALOGS_H */
+#endif /* MPLAYER_GUI_DIALOGS_H */
diff --git a/gui/win32/gui.h b/gui/win32/gui.h
index 3c6c245947..b97bc97c69 100644
--- a/gui/win32/gui.h
+++ b/gui/win32/gui.h
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GUI_GUI_H
-#define GUI_GUI_H
+#ifndef MPLAYER_GUI_GUI_H
+#define MPLAYER_GUI_GUI_H
#include "config.h"
#include "mplayer.h"
@@ -117,4 +117,4 @@ extern void display_eqwindow(gui_t *gui);
extern void display_prefswindow(gui_t *gui);
extern void display_opensubtitlewindow(gui_t *gui);
-#endif /* GUI_GUI_H */
+#endif /* MPLAYER_GUI_GUI_H */
diff --git a/gui/win32/playlist.h b/gui/win32/playlist.h
index 38698e78c1..b9181133dd 100644
--- a/gui/win32/playlist.h
+++ b/gui/win32/playlist.h
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GUI_PLAYLIST_H
-#define GUI_PLAYLIST_H
+#ifndef MPLAYER_GUI_PLAYLIST_H
+#define MPLAYER_GUI_PLAYLIST_H
typedef struct
{
@@ -56,4 +56,4 @@ struct playlist_t
extern playlist_t *create_playlist(void);
extern BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
-#endif /* GUI_PLAYLIST_H */
+#endif /* MPLAYER_GUI_PLAYLIST_H */
diff --git a/gui/win32/skinload.h b/gui/win32/skinload.h
index 69885f36df..6c9e78e754 100644
--- a/gui/win32/skinload.h
+++ b/gui/win32/skinload.h
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GUI_SKINLOAD_H
-#define GUI_SKINLOAD_H
+#ifndef MPLAYER_GUI_SKINLOAD_H
+#define MPLAYER_GUI_SKINLOAD_H
typedef struct
{
@@ -212,4 +212,4 @@ extern skin_t *loadskin(char *skindir, int desktopbpp);
#define evShowWindow 7004
#define evFirstLoad 7005
-#endif /* GUI_SKINLOAD_H */
+#endif /* MPLAYER_GUI_SKINLOAD_H */
diff --git a/gui/win32/wincfg.h b/gui/win32/wincfg.h
index f55b368aa5..48f15cea10 100644
--- a/gui/win32/wincfg.h
+++ b/gui/win32/wincfg.h
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef GUI_WINCFG_H
-#define GUI_WINCFG_H
+#ifndef MPLAYER_GUI_WINCFG_H
+#define MPLAYER_GUI_WINCFG_H
extern char *skinName;
extern int sub_window;
@@ -37,4 +37,4 @@ extern int gui_sub_pos_y;
extern int cfg_read(void);
extern int cfg_write(void);
-#endif /* GUI_WINCFG_H */
+#endif /* MPLAYER_GUI_WINCFG_H */
diff --git a/gui/wm/ws.h b/gui/wm/ws.h
index 90b18894b7..ee215ea61c 100644
--- a/gui/wm/ws.h
+++ b/gui/wm/ws.h
@@ -4,8 +4,8 @@
// Writed by pontscho / fresh!mindworkz
// ----------------------------------------------------------------------------------------------
-#ifndef GUI_WS_H
-#define GUI_WS_H
+#ifndef MPLAYER_GUI_WS_H
+#define MPLAYER_GUI_WS_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -257,4 +257,4 @@ extern void wsScreenSaverOff( Display * mDisplay );
#define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( (X) > (tX) )&&( (Y) > (tY) )&&( (X) < (bX) )&&( (Y) < (bY) ) )
-#endif /* GUI_WS_H */
+#endif /* MPLAYER_GUI_WS_H */
diff --git a/gui/wm/wskeys.h b/gui/wm/wskeys.h
index 3b7eadc20b..aa39bd6285 100644
--- a/gui/wm/wskeys.h
+++ b/gui/wm/wskeys.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_WSKEYS_H
-#define GUI_WSKEYS_H
+#ifndef MPLAYER_GUI_WSKEYS_H
+#define MPLAYER_GUI_WSKEYS_H
#define wsKeyNone -1
@@ -161,4 +160,4 @@ typedef struct
extern const TwsKeyNames wsKeyNames[ wsKeyNumber ];
-#endif /* GUI_WSKEYS_H */
+#endif /* MPLAYER_GUI_WSKEYS_H */
diff --git a/gui/wm/wsmkeys.h b/gui/wm/wsmkeys.h
index c016e035d4..4843004161 100644
--- a/gui/wm/wsmkeys.h
+++ b/gui/wm/wsmkeys.h
@@ -1,5 +1,5 @@
-#ifndef GUI_WSMKEYS_H
-#define GUI_WSMKEYS_H
+#ifndef MPLAYER_GUI_WSMKEYS_H
+#define MPLAYER_GUI_WSMKEYS_H
#include "wskeys.h"
@@ -65,4 +65,4 @@ const TwsKeyNames wsKeyNames[ wsKeyNumber ] =
{ wsKeyNone, "None" }
};
-#endif /* GUI_WSMKEYS_H */
+#endif /* MPLAYER_GUI_WSMKEYS_H */
diff --git a/gui/wm/wsxdnd.h b/gui/wm/wsxdnd.h
index 4694d82733..225a7fccec 100644
--- a/gui/wm/wsxdnd.h
+++ b/gui/wm/wsxdnd.h
@@ -1,6 +1,5 @@
-
-#ifndef GUI_WSXDND_H
-#define GUI_WSXDND_H
+#ifndef MPLAYER_GUI_WSXDND_H
+#define MPLAYER_GUI_WSXDND_H
void wsXDNDInitialize(void);
@@ -50,4 +49,4 @@ void wsXDNDClearAwareness(wsTWindow* window);
/* XdndFinished */
#define XDND_FINISHED_TARGET_WIN(e) ((e)->xclient.data.l[0])
-#endif /* GUI_WSXDND_H */
+#endif /* MPLAYER_GUI_WSXDND_H */
diff --git a/input/ar.h b/input/ar.h
index c6b7c4d5b9..836ba089d1 100644
--- a/input/ar.h
+++ b/input/ar.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef INPUT_AR_H
-#define INPUT_AR_H
+#ifndef MPLAYER_AR_H
+#define MPLAYER_AR_H
#define AR_BASE 0x500
#define AR_PLAY (AR_BASE + 0)
@@ -39,4 +39,4 @@ int mp_input_ar_init(void);
int mp_input_ar_read(int fd);
void mp_input_ar_close(int fd);
-#endif /* INPUT_AR_H */
+#endif /* MPLAYER_AR_H */
diff --git a/input/input.h b/input/input.h
index 1290ecd19d..e6381b3e34 100644
--- a/input/input.h
+++ b/input/input.h
@@ -1,5 +1,5 @@
-#ifndef INPUT_H
-#define INPUT_H
+#ifndef MPLAYER_INPUT_H
+#define MPLAYER_INPUT_H
// All command IDs
#define MP_CMD_SEEK 0
@@ -302,4 +302,4 @@ mp_input_check_interrupt(int time);
extern int async_quit_request;
-#endif /* INPUT_H */
+#endif /* MPLAYER_INPUT_H */
diff --git a/input/joystick.h b/input/joystick.h
index f7b8cb323d..3a70f7cbd3 100644
--- a/input/joystick.h
+++ b/input/joystick.h
@@ -1,5 +1,5 @@
-#ifndef JOYSTICK_H
-#define JOYSTICK_H
+#ifndef MPLAYER_JOYSTICK_H
+#define MPLAYER_JOYSTICK_H
#define JOY_BASE (0x100+128)
#define JOY_AXIS0_PLUS (JOY_BASE+0)
@@ -39,4 +39,4 @@ int mp_input_joystick_init(char* dev);
int mp_input_joystick_read(int fd);
-#endif /* JOYSTICK_H */
+#endif /* MPLAYER_JOYSTICK_H */
diff --git a/input/lirc.h b/input/lirc.h
index 4aabc018a8..cd1513dc53 100644
--- a/input/lirc.h
+++ b/input/lirc.h
@@ -1,5 +1,5 @@
-#ifndef LIRC_H
-#define LIRC_H
+#ifndef MPLAYER_LIRC_H
+#define MPLAYER_LIRC_H
int
mp_input_lirc_init(void);
@@ -10,4 +10,4 @@ mp_input_lirc_read(int fd,char* dest, int s);
void
mp_input_lirc_close(int fd);
-#endif /* LIRC_H */
+#endif /* MPLAYER_LIRC_H */
diff --git a/input/mouse.h b/input/mouse.h
index 0b61efeaa2..e2e6f53fe8 100644
--- a/input/mouse.h
+++ b/input/mouse.h
@@ -1,5 +1,5 @@
-#ifndef MOUSE_H
-#define MOUSE_H
+#ifndef MPLAYER_MOUSE_H
+#define MPLAYER_MOUSE_H
#define MOUSE_BASE ((0x100+256)|MP_NO_REPEAT_KEY)
#define MOUSE_BTN0 (MOUSE_BASE+0)
@@ -25,4 +25,4 @@
#define MOUSE_BTN8_DBL (MOUSE_BASE_DBL+8)
#define MOUSE_BTN9_DBL (MOUSE_BASE_DBL+9)
-#endif /* MOUSE_H */
+#endif /* MPLAYER_MOUSE_H */
diff --git a/libaf/af.h b/libaf/af.h
index 22139275e0..879b7c931c 100644
--- a/libaf/af.h
+++ b/libaf/af.h
@@ -1,5 +1,5 @@
-#ifndef AF_H
-#define AF_H
+#ifndef MPLAYER_AF_H
+#define MPLAYER_AF_H
#include <stdio.h>
@@ -354,4 +354,4 @@ extern af_msg_cfg_t af_msg_cfg; // Message
#endif
//! \}
-#endif /* AF_H */
+#endif /* MPLAYER_AF_H */
diff --git a/libaf/af_format.h b/libaf/af_format.h
index 5588957882..b03779fd14 100644
--- a/libaf/af_format.h
+++ b/libaf/af_format.h
@@ -1,8 +1,9 @@
/* The sample format system used lin libaf is based on bitmasks. The
format definition only refers to the storage format not the
resolution. */
-#ifndef AF_FORMAT_H
-#define AF_FORMAT_H
+
+#ifndef MPLAYER_AF_FORMAT_H
+#define MPLAYER_AF_FORMAT_H
#ifndef MPLAYER_CONFIG_H
#error af_format.h needs config.h
@@ -93,4 +94,4 @@ extern int af_bits2fmt(int bits);
extern char* af_fmt2str(int format, char* str, int size);
extern const char* af_fmt2str_short(int format);
-#endif /* AF_FORMAT_H */
+#endif /* MPLAYER_AF_FORMAT_H */
diff --git a/libaf/af_hrtf.h b/libaf/af_hrtf.h
index 59e5a44ee9..1a5c73e579 100644
--- a/libaf/af_hrtf.h
+++ b/libaf/af_hrtf.h
@@ -1,5 +1,5 @@
-#ifndef AF_HRTF_H
-#define AF_HRTF_H
+#ifndef MPLAYER_AF_HRTF_H
+#define MPLAYER_AF_HRTF_H
#define HRTF_MIX_51 0
#define HRTF_MIX_STEREO 1
@@ -490,4 +490,4 @@ float cr_filt[128] = {
-0.0002379619297227554, 0.0007130120121089036
};
-#endif /* AF_HRTF_H */
+#endif /* MPLAYER_AF_HRTF_H */
diff --git a/libaf/af_mp.h b/libaf/af_mp.h
index 3130b77ef0..3c10c9466d 100644
--- a/libaf/af_mp.h
+++ b/libaf/af_mp.h
@@ -1,6 +1,6 @@
/* Include file for mplayer specific defines and includes */
-#ifndef AF_MP_H
-#define AF_MP_H
+#ifndef MPLAYER_AF_MP_H
+#define MPLAYER_AF_MP_H
#include "config.h"
#include "mp_msg.h"
@@ -19,4 +19,4 @@
#define af_msg(lev, args... ) \
mp_msg(MSGT_AFILTER,(((lev)<0)?((lev)+3):(((lev)==0)?MSGL_INFO:((lev)+5))), ##args )
-#endif /* AF_MP_H */
+#endif /* MPLAYER_AF_MP_H */
diff --git a/libaf/control.h b/libaf/control.h
index 2dc94b6afb..29fa46a5f3 100644
--- a/libaf/control.h
+++ b/libaf/control.h
@@ -1,5 +1,5 @@
-#ifndef AF_CONTROL_H
-#define AF_CONTROL_H
+#ifndef MPLAYER_CONTROL_H
+#define MPLAYER_CONTROL_H
/*********************************************
// Control info struct.
@@ -234,4 +234,4 @@ typedef struct af_control_ext_s{
#define AF_CONTROL_PLAYBACK_SPEED 0x00002500 | AF_CONTROL_FILTER_SPECIFIC
#define AF_CONTROL_SCALETEMPO_AMOUNT 0x00002600 | AF_CONTROL_FILTER_SPECIFIC
-#endif /* AF_CONTROL_H */
+#endif /* MPLAYER_CONTROL_H */
diff --git a/libaf/dsp.h b/libaf/dsp.h
index 2acf8dac0d..0fe9574e55 100644
--- a/libaf/dsp.h
+++ b/libaf/dsp.h
@@ -8,8 +8,8 @@
//=============================================================================
*/
-#ifndef DSP_H
-#define DSP_H
+#ifndef MPLAYER_DSP_H
+#define MPLAYER_DSP_H
/* Implementation of routines used for DSP */
@@ -19,4 +19,4 @@
#include <window.h>
#include <filter.h>
-#endif /* DSP_H */
+#endif /* MPLAYER_DSP_H */
diff --git a/libaf/equalizer.h b/libaf/equalizer.h
index 45a4757d16..8accd97804 100644
--- a/libaf/equalizer.h
+++ b/libaf/equalizer.h
@@ -8,8 +8,8 @@
//=============================================================================
*/
-#ifndef EQUALIZER_H
-#define EQUALIZER_H
+#ifndef MPLAYER_EQUALIZER_H
+#define MPLAYER_EQUALIZER_H
/* Equalizer plugin header file defines struct used for setting or
getting the gain of a specific channel and frequency */
@@ -35,4 +35,4 @@ nr. center frequency
9 16.00 kHz
*/
-#endif /* EQUALIZER_H */
+#endif /* MPLAYER_EQUALIZER_H */
diff --git a/libaf/filter.h b/libaf/filter.h
index 92ff229910..31293f051b 100644
--- a/libaf/filter.h
+++ b/libaf/filter.h
@@ -8,12 +8,12 @@
//=============================================================================
*/
-#if !defined DSP_H
+#if !defined MPLAYER_DSP_H
# error "Never use <filter.h> directly; include <dsp.h> instead"
#endif
-#ifndef FILTER_H
-#define FILTER_H
+#ifndef MPLAYER_FILTER_H
+#define MPLAYER_FILTER_H
// Design and implementation of different types of digital filters
@@ -66,4 +66,4 @@ extern int af_filter_szxform(_ftype_t* a, _ftype_t* b, _ftype_t Q, _ftype_t fc,
xq[xi]=(xq)[(xi)+(n)]=*(in);\
xi=(++(xi))&((n)-1);
-#endif /* FILTER_H */
+#endif /* MPLAYER_FILTER_H */
diff --git a/libaf/reorder_ch.h b/libaf/reorder_ch.h
index 857b9d708e..d48766ab9f 100644
--- a/libaf/reorder_ch.h
+++ b/libaf/reorder_ch.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef REORDER_CH_H
-#define REORDER_CH_H
+#ifndef MPLAYER_REORDER_CH_H
+#define MPLAYER_REORDER_CH_H
// L - Left
// R - Right
@@ -122,4 +122,4 @@ void reorder_channel_nch(void *buf,
int samples,
int samplesize);
-#endif /* REORDER_CH_H */
+#endif /* MPLAYER_REORDER_CH_H */
diff --git a/libaf/window.h b/libaf/window.h
index 6e18414ba3..b45f6e097e 100644
--- a/libaf/window.h
+++ b/libaf/window.h
@@ -15,12 +15,12 @@
coefficients will be stored.
*/
-#if !defined DSP_H
+#if !defined MPLAYER_DSP_H
# error "Never use <window.h> directly; include <dsp.h> instead"
#endif
-#ifndef WINDOW_H
-#define WINDOW_H
+#ifndef MPLAYER_WINDOW_H
+#define MPLAYER_WINDOW_H
extern void af_window_boxcar(int n, _ftype_t* w);
extern void af_window_triang(int n, _ftype_t* w);
@@ -30,4 +30,4 @@ extern void af_window_blackman(int n,_ftype_t* w);
extern void af_window_flattop(int n,_ftype_t* w);
extern void af_window_kaiser(int n, _ftype_t* w,_ftype_t b);
-#endif /* WINDOW_H */
+#endif /* MPLAYER_WINDOW_H */
diff --git a/libao2/audio_out.h b/libao2/audio_out.h
index ff1745b6a0..5fad397313 100644
--- a/libao2/audio_out.h
+++ b/libao2/audio_out.h
@@ -1,6 +1,5 @@
-
-#ifndef AUDIO_OUT_H
-#define AUDIO_OUT_H
+#ifndef MPLAYER_AUDIO_OUT_H
+#define MPLAYER_AUDIO_OUT_H
typedef struct ao_info_s
{
@@ -72,4 +71,4 @@ typedef struct ao_control_vol_s {
float right;
} ao_control_vol_t;
-#endif /* AUDIO_OUT_H */
+#endif /* MPLAYER_AUDIO_OUT_H */
diff --git a/libao2/audio_out_internal.h b/libao2/audio_out_internal.h
index 829f2736a5..b0385411b1 100644
--- a/libao2/audio_out_internal.h
+++ b/libao2/audio_out_internal.h
@@ -1,5 +1,5 @@
-#ifndef AUDIO_OUT_INTERNAL_H
-#define AUDIO_OUT_INTERNAL_H
+#ifndef MPLAYER_AUDIO_OUT_INTERNAL_H
+#define MPLAYER_AUDIO_OUT_INTERNAL_H
// prototypes:
//static ao_info_t info;
@@ -27,4 +27,4 @@ static void audio_resume(void);
audio_resume\
};
-#endif /* AUDIO_OUT_INTERNAL_H */
+#endif /* MPLAYER_AUDIO_OUT_INTERNAL_H */
diff --git a/libmenu/menu.h b/libmenu/menu.h
index 0f1403b7f8..62f137fb96 100644
--- a/libmenu/menu.h
+++ b/libmenu/menu.h
@@ -1,5 +1,5 @@
-#ifndef MENU_H
-#define MENU_H
+#ifndef MPLAYER_MENU_H
+#define MPLAYER_MENU_H
struct menu_priv_s;
typedef struct menu_s menu_t;
@@ -92,4 +92,4 @@ void menu_draw_text_full(mp_image_t* mpi,char* txt,
void menu_draw_box(mp_image_t* mpi, unsigned char grey, unsigned char alpha, int x, int y, int w, int h);
-#endif /* MENU_H */
+#endif /* MPLAYER_MENU_H */
diff --git a/libmenu/menu_list.h b/libmenu/menu_list.h
index 4540eb999b..c1972fff11 100644
--- a/libmenu/menu_list.h
+++ b/libmenu/menu_list.h
@@ -1,5 +1,5 @@
-#ifndef MENU_LIST_H
-#define MENU_LIST_H
+#ifndef MPLAYER_MENU_LIST_H
+#define MPLAYER_MENU_LIST_H
typedef struct list_entry_s list_entry_t;
@@ -83,4 +83,4 @@ extern const menu_list_priv_t menu_list_priv_dflt;
{ "ptr-bg-alpha", M_ST_OFF(menu_list_priv_t,ptr_bg_alpha), \
CONF_TYPE_INT, M_OPT_RANGE, 0, 255, NULL } \
-#endif /* MENU_LIST_H */
+#endif /* MPLAYER_MENU_LIST_H */
diff --git a/libmpcodecs/ad.h b/libmpcodecs/ad.h
index d9178a85c2..34a654e071 100644
--- a/libmpcodecs/ad.h
+++ b/libmpcodecs/ad.h
@@ -1,5 +1,5 @@
-#ifndef AD_H
-#define AD_H
+#ifndef MPLAYER_AD_H
+#define MPLAYER_AD_H
#include "mpc_info.h"
typedef mp_codec_info_t ad_info_t;
@@ -30,4 +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 */
+#endif /* MPLAYER_AD_H */
diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h
index c7a2457535..0bd01bcd6c 100644
--- a/libmpcodecs/ad_internal.h
+++ b/libmpcodecs/ad_internal.h
@@ -1,5 +1,5 @@
-#ifndef AD_INTERNAL_H
-#define AD_INTERNAL_H
+#ifndef MPLAYER_AD_INTERNAL_H
+#define MPLAYER_AD_INTERNAL_H
#include "codec-cfg.h"
#include "libaf/af_format.h"
@@ -26,4 +26,4 @@ static int decode_audio(sh_audio_t *sh,unsigned char *buffer,int minlen,int maxl
decode_audio\
};
-#endif /* AD_INTERNAL_H */
+#endif /* MPLAYER_AD_INTERNAL_H */
diff --git a/libmpcodecs/ae.h b/libmpcodecs/ae.h
index d92d56f513..fb5744ece7 100644
--- a/libmpcodecs/ae.h
+++ b/libmpcodecs/ae.h
@@ -1,6 +1,5 @@
-
-#ifndef AE_H
-#define AE_H
+#ifndef MPLAYER_AE_H
+#define MPLAYER_AE_H
#define ACODEC_COPY 0
#define ACODEC_PCM 1
@@ -43,4 +42,4 @@ typedef struct audio_encoder_s {
audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params);
-#endif /* AE_H */
+#endif /* MPLAYER_AE_H */
diff --git a/libmpcodecs/ae_faac.h b/libmpcodecs/ae_faac.h
index 10366e03b6..13e970e0d7 100644
--- a/libmpcodecs/ae_faac.h
+++ b/libmpcodecs/ae_faac.h
@@ -1,8 +1,8 @@
-#ifndef AE_FAAC_H
-#define AE_FAAC_H
+#ifndef MPLAYER_AE_FAAC_H
+#define MPLAYER_AE_FAAC_H
#include "ae.h"
int mpae_init_faac(audio_encoder_t *encoder);
-#endif /* AE_FAAC_H */
+#endif /* MPLAYER_AE_FAAC_H */
diff --git a/libmpcodecs/ae_lame.h b/libmpcodecs/ae_lame.h
index 221e5ffe64..39ff83a72b 100644
--- a/libmpcodecs/ae_lame.h
+++ b/libmpcodecs/ae_lame.h
@@ -1,8 +1,8 @@
-#ifndef AE_LAME_H
-#define AE_LAME_H
+#ifndef MPLAYER_AE_LAME_H
+#define MPLAYER_AE_LAME_H
#include "ae.h"
int mpae_init_lame(audio_encoder_t *encoder);
-#endif /* AE_LAME_H */
+#endif /* MPLAYER_AE_LAME_H */
diff --git a/libmpcodecs/ae_lavc.h b/libmpcodecs/ae_lavc.h
index b2000b7583..f84eeaaf56 100644
--- a/libmpcodecs/ae_lavc.h
+++ b/libmpcodecs/ae_lavc.h
@@ -1,8 +1,8 @@
-#ifndef AE_LAVC_H
-#define AE_LAVC_H
+#ifndef MPLAYER_AE_LAVC_H
+#define MPLAYER_AE_LAVC_H
#include "ae.h"
int mpae_init_lavc(audio_encoder_t *encoder);
-#endif /* AE_LAVC_H */
+#endif /* MPLAYER_AE_LAVC_H */
diff --git a/libmpcodecs/ae_pcm.h b/libmpcodecs/ae_pcm.h
index 5eae0631b1..54698d56ca 100644
--- a/libmpcodecs/ae_pcm.h
+++ b/libmpcodecs/ae_pcm.h
@@ -1,8 +1,8 @@
-#ifndef AE_PCM_H
-#define AE_PCM_H
+#ifndef MPLAYER_AE_PCM_H
+#define MPLAYER_AE_PCM_H
#include "ae.h"
int mpae_init_pcm(audio_encoder_t *encoder);
-#endif /* AE_PCM_H */
+#endif /* MPLAYER_AE_PCM_H */
diff --git a/libmpcodecs/ae_toolame.h b/libmpcodecs/ae_toolame.h
index 06c8c35b8e..ee00b6c301 100644
--- a/libmpcodecs/ae_toolame.h
+++ b/libmpcodecs/ae_toolame.h
@@ -1,5 +1,5 @@
-#ifndef AE_TOOLAME_H
-#define AE_TOOLAME_H
+#ifndef MPLAYER_AE_TOOLAME_H
+#define MPLAYER_AE_TOOLAME_H
#include "ae.h"
#include <toolame.h>
@@ -13,4 +13,4 @@ typedef struct {
int mpae_init_toolame(audio_encoder_t *encoder);
-#endif /* AE_TOOLAME_H */
+#endif /* MPLAYER_AE_TOOLAME_H */
diff --git a/libmpcodecs/ae_twolame.h b/libmpcodecs/ae_twolame.h
index ae226ea059..a7dd16832d 100644
--- a/libmpcodecs/ae_twolame.h
+++ b/libmpcodecs/ae_twolame.h
@@ -1,5 +1,5 @@
-#ifndef AE_TWOLAME_H
-#define AE_TWOLAME_H
+#ifndef MPLAYER_AE_TWOLAME_H
+#define MPLAYER_AE_TWOLAME_H
#include "ae.h"
#include <twolame.h>
@@ -11,4 +11,4 @@ typedef struct {
int mpae_init_twolame(audio_encoder_t *encoder);
-#endif /* AE_TWOLAME_H */
+#endif /* MPLAYER_AE_TWOLAME_H */
diff --git a/libmpcodecs/cmmx.h b/libmpcodecs/cmmx.h
index 27b3070282..6e0c8509f5 100644
--- a/libmpcodecs/cmmx.h
+++ b/libmpcodecs/cmmx.h
@@ -4,8 +4,8 @@
* Author: Zoltan Hidvegi
*/
-#ifndef CMMX_H
-#define CMMX_H
+#ifndef MPLAYER_CMMX_H
+#define MPLAYER_CMMX_H
typedef unsigned long cmmx_t;
@@ -183,4 +183,4 @@ pcmpeqb(cmmx_t a, cmmx_t b)
return pcmpzb(a ^ b);
}
-#endif /* CMMX_H */
+#endif /* MPLAYER_CMMX_H */
diff --git a/libmpcodecs/dec_audio.h b/libmpcodecs/dec_audio.h
index 0c325ced62..0a09ad5be1 100644
--- a/libmpcodecs/dec_audio.h
+++ b/libmpcodecs/dec_audio.h
@@ -1,5 +1,5 @@
-#ifndef DEC_AUDIO_H
-#define DEC_AUDIO_H
+#ifndef MPLAYER_DEC_AUDIO_H
+#define MPLAYER_DEC_AUDIO_H
// dec_audio.c:
extern void afm_help(void);
@@ -12,4 +12,4 @@ 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 */
+#endif /* MPLAYER_DEC_AUDIO_H */
diff --git a/libmpcodecs/dec_video.h b/libmpcodecs/dec_video.h
index 7e73133144..641981b30c 100644
--- a/libmpcodecs/dec_video.h
+++ b/libmpcodecs/dec_video.h
@@ -1,5 +1,5 @@
-#ifndef DEC_VIDEO_H
-#define DEC_VIDEO_H
+#ifndef MPLAYER_DEC_VIDEO_H
+#define MPLAYER_DEC_VIDEO_H
// dec_video.c:
extern void vfm_help(void);
@@ -21,4 +21,4 @@ extern int get_current_video_decoder_lag(sh_video_t *sh_video);
extern int divx_quality;
-#endif /* DEC_VIDEO_H */
+#endif /* MPLAYER_DEC_VIDEO_H */
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h
index 5f6040a267..c15269b580 100644
--- a/libmpcodecs/img_format.h
+++ b/libmpcodecs/img_format.h
@@ -1,6 +1,5 @@
-
-#ifndef IMG_FORMAT_H
-#define IMG_FORMAT_H
+#ifndef MPLAYER_IMG_FORMAT_H
+#define MPLAYER_IMG_FORMAT_H
/* RGB/BGR Formats */
@@ -117,4 +116,4 @@ typedef struct {
const char *vo_format_name(int format);
-#endif /* IMG_FORMAT_H */
+#endif /* MPLAYER_IMG_FORMAT_H */
diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h
index 624a9d66c3..fb1ce76a09 100644
--- a/libmpcodecs/mp_image.h
+++ b/libmpcodecs/mp_image.h
@@ -1,5 +1,5 @@
-#ifndef MP_IMAGE_H
-#define MP_IMAGE_H
+#ifndef MPLAYER_MP_IMAGE_H
+#define MPLAYER_MP_IMAGE_H
//--------- codec's requirements (filled by the codec/vf) ---------
@@ -228,4 +228,4 @@ static inline void free_mp_image(mp_image_t* mpi){
mp_image_t* alloc_mpi(int w, int h, unsigned long int fmt);
void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi);
-#endif /* MP_IMAGE_H */
+#endif /* MPLAYER_MP_IMAGE_H */
diff --git a/libmpcodecs/mpc_info.h b/libmpcodecs/mpc_info.h
index fadf898290..845f6a73e4 100644
--- a/libmpcodecs/mpc_info.h
+++ b/libmpcodecs/mpc_info.h
@@ -1,5 +1,5 @@
-#ifndef MPC_INFO_H
-#define MPC_INFO_H
+#ifndef MPLAYER_MPC_INFO_H
+#define MPLAYER_MPC_INFO_H
typedef struct mp_codec_info_s
{
@@ -22,4 +22,4 @@ typedef struct mp_codec_info_s
#define CONTROL_ERROR -2
#define CONTROL_NA -3
-#endif /* MPC_INFO_H */
+#endif /* MPLAYER_MPC_INFO_H */
diff --git a/libmpcodecs/native/alaw.h b/libmpcodecs/native/alaw.h
index 840fa6b2c9..e086e1d151 100644
--- a/libmpcodecs/native/alaw.h
+++ b/libmpcodecs/native/alaw.h
@@ -1,7 +1,7 @@
// Generated by TOOLS/alaw-gen.c
-#ifndef ALAW_H
-#define ALAW_H
+#ifndef MPLAYER_ALAW_H
+#define MPLAYER_ALAW_H
const short alaw2short[]={
-5504, -5248, -6016, -5760, -4480, -4224, -4992, -4736,
@@ -73,4 +73,4 @@ const short ulaw2short[]={
56, 48, 40, 32, 24, 16, 8, 0
};
-#endif /* ALAW_H */
+#endif /* MPLAYER_ALAW_H */
diff --git a/libmpcodecs/native/mmx.h b/libmpcodecs/native/mmx.h
index 0a41e0e8a7..d9a6fb65cb 100644
--- a/libmpcodecs/native/mmx.h
+++ b/libmpcodecs/native/mmx.h
@@ -1,5 +1,5 @@
-#ifndef MMX_H
-#define MMX_H
+#ifndef MPLAYER_MMX_H
+#define MPLAYER_MMX_H
typedef union {
long long q; /* Quadword (64-bit) value */
@@ -77,4 +77,4 @@ typedef union {
#define emms() __asm__ __volatile__ ("emms")
-#endif /* MMX_H */
+#endif /* MPLAYER_MMX_H */
diff --git a/libmpcodecs/native/xa_gsm.h b/libmpcodecs/native/xa_gsm.h
index 670d9a418c..da577a4df1 100644
--- a/libmpcodecs/native/xa_gsm.h
+++ b/libmpcodecs/native/xa_gsm.h
@@ -1,8 +1,8 @@
-#ifndef XA_GSM_H
-#define XA_GSM_H
+#ifndef MPLAYER_XA_GSM_H
+#define MPLAYER_XA_GSM_H
void XA_MSGSM_Decoder(unsigned char *ibuf,unsigned short *obuf);
void XA_GSM_Decoder(unsigned char *ibuf,unsigned short *obuf);
void GSM_Init(void);
-#endif /* XA_GSM_H */
+#endif /* MPLAYER_XA_GSM_H */
diff --git a/libmpcodecs/native/xa_gsm_int.h b/libmpcodecs/native/xa_gsm_int.h
index a147308445..40a31a8cb3 100644
--- a/libmpcodecs/native/xa_gsm_int.h
+++ b/libmpcodecs/native/xa_gsm_int.h
@@ -22,8 +22,8 @@
*
********************************************************************/
-#ifndef XA_GSM_INT_H
-#define XA_GSM_INT_H
+#ifndef MPLAYER_XA_GSM_INT_H
+#define MPLAYER_XA_GSM_INT_H
#include "xa_gsm.h"
@@ -131,4 +131,4 @@ typedef struct {
*/
-#endif /* XA_GSM_INT_H */
+#endif /* MPLAYER_XA_GSM_INT_H */
diff --git a/libmpcodecs/pullup.h b/libmpcodecs/pullup.h
index 04a2f95bb7..4b1dbb2d55 100644
--- a/libmpcodecs/pullup.h
+++ b/libmpcodecs/pullup.h
@@ -1,5 +1,5 @@
-#ifndef PULLUP_H
-#define PULLUP_H
+#ifndef MPLAYER_PULLUP_H
+#define MPLAYER_PULLUP_H
#define PULLUP_CPU_MMX 1
#define PULLUP_CPU_MMX2 2
@@ -81,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 */
+#endif /* MPLAYER_PULLUP_H */
diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h
index c37c0e40cf..4c4ef11340 100644
--- a/libmpcodecs/vd.h
+++ b/libmpcodecs/vd.h
@@ -1,5 +1,5 @@
-#ifndef VD_H
-#define VD_H
+#ifndef MPLAYER_VD_H
+#define MPLAYER_VD_H
#include "mp_image.h"
#include "mpc_info.h"
@@ -35,4 +35,4 @@ void mpcodecs_draw_slice(sh_video_t *sh, unsigned char** src, int* stride, int w
#define VDFLAGS_DROPFRAME 3
-#endif /* VD_H */
+#endif /* MPLAYER_VD_H */
diff --git a/libmpcodecs/vd_internal.h b/libmpcodecs/vd_internal.h
index c396c379f1..d04903e26a 100644
--- a/libmpcodecs/vd_internal.h
+++ b/libmpcodecs/vd_internal.h
@@ -1,5 +1,5 @@
-#ifndef VD_INTERNAL_H
-#define VD_INTERNAL_H
+#ifndef MPLAYER_VD_INTERNAL_H
+#define MPLAYER_VD_INTERNAL_H
#include "codec-cfg.h"
#include "img_format.h"
@@ -27,4 +27,4 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags);
decode\
};
-#endif /* VD_INTERNAL_H */
+#endif /* MPLAYER_VD_INTERNAL_H */
diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
index d4451f4b5b..d5113b049f 100644
--- a/libmpcodecs/vf.h
+++ b/libmpcodecs/vf.h
@@ -1,5 +1,5 @@
-#ifndef VF_H
-#define VF_H
+#ifndef MPLAYER_VF_H
+#define MPLAYER_VF_H
struct vf_instance_s;
struct vf_priv_s;
@@ -123,4 +123,4 @@ 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 */
+#endif /* MPLAYER_VF_H */
diff --git a/libmpcodecs/vf_scale.h b/libmpcodecs/vf_scale.h
index 18c1f3af1f..851f4af6d5 100644
--- a/libmpcodecs/vf_scale.h
+++ b/libmpcodecs/vf_scale.h
@@ -1,9 +1,9 @@
//GPL
-#ifndef VF_SCALE_H
-#define VF_SCALE_H
+#ifndef MPLAYER_VF_SCALE_H
+#define MPLAYER_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 */
+#endif /* MPLAYER_VF_SCALE_H */
diff --git a/libmpcodecs/vfcap.h b/libmpcodecs/vfcap.h
index 88a2c8737b..9745a5c9bd 100644
--- a/libmpcodecs/vfcap.h
+++ b/libmpcodecs/vfcap.h
@@ -1,7 +1,7 @@
// VFCAP_* values: they are flags, returned by query_format():
-#ifndef VFCAP_H
-#define VFCAP_H
+#ifndef MPLAYER_VFCAP_H
+#define MPLAYER_VFCAP_H
// set, if the given colorspace is supported (with or without conversion)
#define VFCAP_CSP_SUPPORTED 0x1
@@ -34,4 +34,4 @@
// filter will draw EOSD at screen resolution (without scaling)
#define VFCAP_EOSD_UNSCALED 0x4000
-#endif /* VFCAP_H */
+#endif /* MPLAYER_VFCAP_H */
diff --git a/libmpcodecs/vqf.h b/libmpcodecs/vqf.h
index 8e43889def..e5d2368eac 100644
--- a/libmpcodecs/vqf.h
+++ b/libmpcodecs/vqf.h
@@ -5,8 +5,8 @@
// Modified for MPlayer on 2004.12.29
-#ifndef VQF_H
-#define VQF_H
+#ifndef MPLAYER_VQF_H
+#define MPLAYER_VQF_H
#ifdef _MSC_VER
# ifdef DLL_MODULE
@@ -223,4 +223,4 @@ DllPort int TvqGetFbTotalBits(); // query total number of used bits
#endif
-#endif /* VQF_H */
+#endif /* MPLAYER_VQF_H */
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h
index 6eb6b101e0..1f89edf7fb 100644
--- a/libmpdemux/asf.h
+++ b/libmpdemux/asf.h
@@ -1,5 +1,5 @@
-#ifndef ASF_H
-#define ASF_H
+#ifndef MPLAYER_ASF_H
+#define MPLAYER_ASF_H
//#include "config.h" /* for WORDS_BIGENDIAN */
#include <inttypes.h>
@@ -244,4 +244,4 @@ struct asf_priv {
unsigned bps;
};
-#endif /* ASF_H */
+#endif /* MPLAYER_ASF_H */
diff --git a/libmpdemux/aviheader.h b/libmpdemux/aviheader.h
index 581e1c9b39..3c1e782062 100644
--- a/libmpdemux/aviheader.h
+++ b/libmpdemux/aviheader.h
@@ -1,5 +1,5 @@
-#ifndef AVIHEADER_H
-#define AVIHEADER_H
+#ifndef MPLAYER_AVIHEADER_H
+#define MPLAYER_AVIHEADER_H
//#include "config.h" /* get correct definition WORDS_BIGENDIAN */
#include "libavutil/common.h"
@@ -353,4 +353,4 @@ typedef struct {
#define AVI_IDX_OFFSET(x) ((((uint64_t)(x)->dwFlags&0xffff0000)<<16)+(x)->dwChunkOffset)
-#endif /* AVIHEADER_H */
+#endif /* MPLAYER_AVIHEADER_H */
diff --git a/libmpdemux/demux_avs.h b/libmpdemux/demux_avs.h
index b45f8cc575..49cb1d6131 100644
--- a/libmpdemux/demux_avs.h
+++ b/libmpdemux/demux_avs.h
@@ -21,8 +21,8 @@
* Boston, MA 02110-1301 USA.
*/
-#ifndef DEMUX_AVS_H
-#define DEMUX_AVS_H
+#ifndef MPLAYER_DEMUX_AVS_H
+#define MPLAYER_DEMUX_AVS_H
enum { AVISYNTH_INTERFACE_VERSION = 2 };
@@ -166,4 +166,4 @@ static inline int avs_bits_per_pixel(const AVS_VideoInfo * p)
}
}
-#endif /* DEMUX_AVS_H */
+#endif /* MPLAYER_DEMUX_AVS_H */
diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h
index 5eba3a680e..b60ec54fe1 100644
--- a/libmpdemux/demux_rtp.h
+++ b/libmpdemux/demux_rtp.h
@@ -1,5 +1,5 @@
-#ifndef DEMUX_RTP_H
-#define DEMUX_RTP_H
+#ifndef MPLAYER_DEMUX_RTP_H
+#define MPLAYER_DEMUX_RTP_H
#include <stdlib.h>
#include <stdio.h>
@@ -28,4 +28,4 @@ int demux_rtp_fill_buffer(demuxer_t *demux, demux_stream_t* ds);
// Close a RTP demuxer
void demux_close_rtp(demuxer_t* demuxer);
-#endif /* DEMUX_RTP_H */
+#endif /* MPLAYER_DEMUX_RTP_H */
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index ba92e2b33d..d3dde77fd2 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -1,5 +1,5 @@
-#ifndef DEMUX_RTP_INTERNAL_H
-#define DEMUX_RTP_INTERNAL_H
+#ifndef MPLAYER_DEMUX_RTP_INTERNAL_H
+#define MPLAYER_DEMUX_RTP_INTERNAL_H
#include <stdlib.h>
@@ -41,4 +41,4 @@ Boolean awaitRTPPacket(demuxer_t* demuxer, demux_stream_t* ds,
// "streamType": 0 => video; 1 => audio
// This routine returns False if the input stream has closed
-#endif /* DEMUX_RTP_INTERNAL_H */
+#endif /* MPLAYER_DEMUX_RTP_INTERNAL_H */
diff --git a/libmpdemux/demux_xmms_plugin.h b/libmpdemux/demux_xmms_plugin.h
index e0020fd224..dd9183b26b 100644
--- a/libmpdemux/demux_xmms_plugin.h
+++ b/libmpdemux/demux_xmms_plugin.h
@@ -21,8 +21,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#ifndef DEMUX_XMMS_PLUGIN_H
-#define DEMUX_XMMS_PLUGIN_H
+#ifndef MPLAYER_DEMUX_XMMS_PLUGIN_H
+#define MPLAYER_DEMUX_XMMS_PLUGIN_H
typedef enum
{
@@ -152,4 +152,4 @@ typedef struct VisPlugin
void (*render_freq)(short freq_data[2][256]); /* Render the freq data, don't do anything time consuming in here */
} VisPlugin;
-#endif /* DEMUX_XMMS_PLUGIN_H */
+#endif /* MPLAYER_DEMUX_XMMS_PLUGIN_H */
diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
index 08f7ad538e..76f4baca16 100644
--- a/libmpdemux/demuxer.h
+++ b/libmpdemux/demuxer.h
@@ -1,5 +1,5 @@
-#ifndef DEMUXER_H
-#define DEMUXER_H
+#ifndef MPLAYER_DEMUXER_H
+#define MPLAYER_DEMUXER_H
#ifdef USE_ASS
#include "libass/ass_types.h"
@@ -421,4 +421,4 @@ int demuxer_set_angle(demuxer_t *demuxer, int angle);
/// Get number of angles.
int demuxer_angles_count(demuxer_t *demuxer);
-#endif /* DEMUXER_H */
+#endif /* MPLAYER_DEMUXER_H */
diff --git a/libmpdemux/ebml.h b/libmpdemux/ebml.h
index 967bffa118..919fd526df 100644
--- a/libmpdemux/ebml.h
+++ b/libmpdemux/ebml.h
@@ -1,5 +1,5 @@
-#ifndef EBML_H
-#define EBML_H
+#ifndef MPLAYER_EBML_H
+#define MPLAYER_EBML_H
#include <inttypes.h>
@@ -188,4 +188,4 @@ int ebml_read_skip (stream_t *s, uint64_t *length);
uint32_t ebml_read_master (stream_t *s, uint64_t *length);
char *ebml_read_header (stream_t *s, int *version);
-#endif /* EBML_H */
+#endif /* MPLAYER_EBML_H */
diff --git a/libmpdemux/genres.h b/libmpdemux/genres.h
index 54f97b36f4..523b48c3db 100644
--- a/libmpdemux/genres.h
+++ b/libmpdemux/genres.h
@@ -13,9 +13,8 @@
* detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/
*/
-
-#ifndef GENRES_H
-#define GENRES_H
+#ifndef MPLAYER_GENRES_H
+#define MPLAYER_GENRES_H
const char * const genres[] = {
@@ -277,5 +276,4 @@ const char * const genres[] = {
"Unknown", /* 255 */
};
-
-#endif /* GENRES_H */
+#endif /* MPLAYER_GENRES_H */
diff --git a/libmpdemux/matroska.h b/libmpdemux/matroska.h
index 9efce44d27..d4238ff90c 100644
--- a/libmpdemux/matroska.h
+++ b/libmpdemux/matroska.h
@@ -4,8 +4,8 @@
* see http://cvs.corecodec.org/cgi-bin/cvsweb.cgi/~checkout~/matroska/doc/website/specs/codex.html?rev=HEAD&content-type=text/html
*/
-#ifndef MATROSKA_H
-#define MATROSKA_H
+#ifndef MPLAYER_MATROSKA_H
+#define MPLAYER_MATROSKA_H
#define MKV_A_AAC_2MAIN "A_AAC/MPEG2/MAIN"
#define MKV_A_AAC_2LC "A_AAC/MPEG2/LC"
@@ -67,4 +67,4 @@ void demux_mkv_get_audio_lang(demuxer_t *demuxer, int track_num, char *lang,
void demux_mkv_get_sub_lang(demuxer_t *demuxer, int track_num, char *lang,
int maxlen);
-#endif /* MATROSKA_H */
+#endif /* MPLAYER_MATROSKA_H */
diff --git a/libmpdemux/mf.h b/libmpdemux/mf.h
index 1e58c7293d..fe104f47b3 100644
--- a/libmpdemux/mf.h
+++ b/libmpdemux/mf.h
@@ -1,6 +1,6 @@
-#ifndef MF_H
-#define MF_H
+#ifndef MPLAYER_MF_H
+#define MPLAYER_MF_H
extern int mf_w;
extern int mf_h;
@@ -16,4 +16,4 @@ typedef struct
mf_t* open_mf(char * filename);
-#endif /* MF_H */
+#endif /* MPLAYER_MF_H */
diff --git a/libmpdemux/mp3_hdr.h b/libmpdemux/mp3_hdr.h
index 8133b5ed29..d5aa70b651 100644
--- a/libmpdemux/mp3_hdr.h
+++ b/libmpdemux/mp3_hdr.h
@@ -1,5 +1,5 @@
-#ifndef MP3_HDR_H
-#define MP3_HDR_H
+#ifndef MPLAYER_MP3_HDR_H
+#define MPLAYER_MP3_HDR_H
int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* freq, int* spf, int* mpa_layer, int* br);
@@ -12,4 +12,4 @@ static inline int mp_check_mp3_header(unsigned int head){
return 1;
}
-#endif /* MP3_HDR_H */
+#endif /* MPLAYER_MP3_HDR_H */
diff --git a/libmpdemux/mpeg_hdr.h b/libmpdemux/mpeg_hdr.h
index 31ac33378c..dc2c1646d8 100644
--- a/libmpdemux/mpeg_hdr.h
+++ b/libmpdemux/mpeg_hdr.h
@@ -1,5 +1,5 @@
-#ifndef MPEG_HDR_H
-#define MPEG_HDR_H
+#ifndef MPLAYER_MPEG_HDR_H
+#define MPLAYER_MPEG_HDR_H
typedef struct {
// video info:
@@ -30,4 +30,4 @@ 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 */
+#endif /* MPLAYER_MPEG_HDR_H */
diff --git a/libmpdemux/mpeg_packetizer.h b/libmpdemux/mpeg_packetizer.h
index 1273b86b3a..5fb8de95c3 100644
--- a/libmpdemux/mpeg_packetizer.h
+++ b/libmpdemux/mpeg_packetizer.h
@@ -22,8 +22,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef MPEG_PACKETIZER_H
-#define MPEG_PACKETIZER_H
+#ifndef MPLAYER_MPEG_PACKETIZER_H
+#define MPLAYER_MPEG_PACKETIZER_H
/* Send MPEG <type> PES packet */
int send_mpeg_pes_packet (unsigned char *data, int len, int id, uint64_t pts,
@@ -38,4 +38,4 @@ int send_mpeg_lpcm_packet (unsigned char *data, int len,
int id, uint64_t pts, int freq_id,
int my_write (const unsigned char *data, int len));
-#endif /* MPEG_PACKETIZER_H */
+#endif /* MPLAYER_MPEG_PACKETIZER_H */
diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h
index 4595f269dd..6b810569d7 100644
--- a/libmpdemux/ms_hdr.h
+++ b/libmpdemux/ms_hdr.h
@@ -1,5 +1,5 @@
-#ifndef MS_HDR_H
-#define MS_HDR_H
+#ifndef MPLAYER_MS_HDR_H
+#define MPLAYER_MS_HDR_H
#ifndef _WAVEFORMATEX_
#define _WAVEFORMATEX_
@@ -79,4 +79,4 @@ typedef struct {
#endif
#endif
-#endif /* MS_HDR_H */
+#endif /* MPLAYER_MS_HDR_H */
diff --git a/libmpdemux/muxer.h b/libmpdemux/muxer.h
index a01206af44..3c22e140c2 100644
--- a/libmpdemux/muxer.h
+++ b/libmpdemux/muxer.h
@@ -1,5 +1,5 @@
-#ifndef MUXER_H
-#define MUXER_H
+#ifndef MPLAYER_MUXER_H
+#define MPLAYER_MUXER_H
#define MUXER_MAX_STREAMS 16
@@ -116,4 +116,4 @@ int muxer_init_muxer_rawvideo(muxer_t *);
int muxer_init_muxer_lavf(muxer_t *);
int muxer_init_muxer_rawaudio(muxer_t *);
-#endif /* MUXER_H */
+#endif /* MPLAYER_MUXER_H */
diff --git a/libmpdemux/nuppelvideo.h b/libmpdemux/nuppelvideo.h
index f1b81cced5..5534318e82 100644
--- a/libmpdemux/nuppelvideo.h
+++ b/libmpdemux/nuppelvideo.h
@@ -1,7 +1,7 @@
/* nuppelvideo.h rh */
-#ifndef NUPPELVIDEO_H
-#define NUPPELVIDEO_H
+#ifndef MPLAYER_NUPPELVIDEO_H
+#define MPLAYER_NUPPELVIDEO_H
#include "libavutil/intfloat_readwrite.h"
@@ -159,4 +159,4 @@ typedef struct audbuffertype
(h)->lavc_maxqdiff = le2me_32((h)->lavc_maxqdiff); \
}
-#endif /* NUPPELVIDEO_H */
+#endif /* MPLAYER_NUPPELVIDEO_H */
diff --git a/libmpdemux/parse_es.h b/libmpdemux/parse_es.h
index fceed0c895..9852701ee1 100644
--- a/libmpdemux/parse_es.h
+++ b/libmpdemux/parse_es.h
@@ -1,5 +1,5 @@
-#ifndef PARSE_ES_H
-#define PARSE_ES_H
+#ifndef MPLAYER_PARSE_ES_H
+#define MPLAYER_PARSE_ES_H
#define MAX_VIDEO_PACKET_SIZE (224*1024+4)
#define VIDEOBUFFER_SIZE 0x100000
@@ -18,4 +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 */
+#endif /* MPLAYER_PARSE_ES_H */
diff --git a/libmpdemux/parse_mp4.h b/libmpdemux/parse_mp4.h
index 9173d36a86..585751c320 100644
--- a/libmpdemux/parse_mp4.h
+++ b/libmpdemux/parse_mp4.h
@@ -4,8 +4,8 @@
* File licensed under the GPL, see http://www.fsf.org/ for more info.
*/
-#ifndef PARSE_MP4_H
-#define PARSE_MP4_H
+#ifndef MPLAYER_PARSE_MP4_H
+#define MPLAYER_PARSE_MP4_H
#include <inttypes.h>
@@ -107,5 +107,5 @@ typedef struct {
int mp4_parse_esds(unsigned char *data, int datalen, esds_t *esds);
void mp4_free_esds(esds_t *esds);
-#endif /* PARSE_MP4_H */
+#endif /* MPLAYER_PARSE_MP4_H */
diff --git a/libmpdemux/qtpalette.h b/libmpdemux/qtpalette.h
index 1e0a63fa46..d2e3a33c5a 100644
--- a/libmpdemux/qtpalette.h
+++ b/libmpdemux/qtpalette.h
@@ -2,8 +2,8 @@
// Automatically generated from a utility derived from XAnim:
// http://xanim.va.pubnix.com/home.html
-#ifndef QTPALETTE_H
-#define QTPALETTE_H
+#ifndef MPLAYER_QTPALETTE_H
+#define MPLAYER_QTPALETTE_H
static const unsigned char qt_default_palette_4[4 * 4] = {
0x5E, 0x65, 0x93, 0x00,
@@ -568,4 +568,4 @@ static const unsigned char qt_default_grayscale_palette_256[256 * 4] = {
/* 255, 0xFF */ 0x00, 0x00, 0x00, 0x00
};
-#endif /* QTPALETTE_H */
+#endif /* MPLAYER_QTPALETTE_H */
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index 1c727f07c8..7ebeefb07f 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -1,5 +1,5 @@
-#ifndef STHEADER_H
-#define STHEADER_H
+#ifndef MPLAYER_STHEADER_H
+#define MPLAYER_STHEADER_H
#include "aviheader.h"
#include "ms_hdr.h"
@@ -121,4 +121,4 @@ void free_sh_video(sh_video_t *sh);
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 /* STHEADER_H */
+#endif /* MPLAYER_STHEADER_H */
diff --git a/libmpdemux/yuv4mpeg.h b/libmpdemux/yuv4mpeg.h
index 157d426c0e..3609388596 100644
--- a/libmpdemux/yuv4mpeg.h
+++ b/libmpdemux/yuv4mpeg.h
@@ -24,8 +24,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef YUV4MPEG_H
-#define YUV4MPEG_H
+#ifndef MPLAYER_YUV4MPEG_H
+#define MPLAYER_YUV4MPEG_H
#include <stdlib.h>
//#include "mp_msg.h"
@@ -449,6 +449,6 @@ int y4m_allow_unknown_tags(int yn);
************************************************************************
************************************************************************/
-#endif /* YUV4MPEG_H */
+#endif /* MPLAYER_YUV4MPEG_H */
diff --git a/libmpdemux/yuv4mpeg_intern.h b/libmpdemux/yuv4mpeg_intern.h
index edf447509e..a956bbf4e9 100644
--- a/libmpdemux/yuv4mpeg_intern.h
+++ b/libmpdemux/yuv4mpeg_intern.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef YUV4MPEG_INTERN_H
-#define YUV4MPEG_INTERN_H
+#ifndef MPLAYER_YUV4MPEG_INTERN_H
+#define MPLAYER_YUV4MPEG_INTERN_H
#define Y4M_MAGIC "YUV4MPEG2"
@@ -75,4 +75,4 @@
#define Y4M_DAR_MPEG2_3 { 16, 9 }
#define Y4M_DAR_MPEG2_4 { 221, 100 }
-#endif /* YUV4MPEG_INTERN_H */
+#endif /* MPLAYER_YUV4MPEG_INTERN_H */
diff --git a/libvo/aspect.h b/libvo/aspect.h
index cc1d0a8802..be5e4a12f8 100644
--- a/libvo/aspect.h
+++ b/libvo/aspect.h
@@ -1,5 +1,5 @@
-#ifndef ASPECT_H
-#define ASPECT_H
+#ifndef MPLAYER_ASPECT_H
+#define MPLAYER_ASPECT_H
/* Stuff for correct aspect scaling. */
extern int vo_panscan_x;
@@ -21,4 +21,4 @@ void aspect_save_screenres(int scrw, int scrh);
void aspect(int *srcw, int *srch, int zoom);
void aspect_fit(int *srcw, int *srch, int fitw, int fith);
-#endif /* ASPECT_H */
+#endif /* MPLAYER_ASPECT_H */
diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h
index e09deb4f5b..ae9d2745e1 100644
--- a/libvo/fastmemcpy.h
+++ b/libvo/fastmemcpy.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef FASTMEMCPY_H
-#define FASTMEMCPY_H
+#ifndef MPLAYER_FASTMEMCPY_H
+#define MPLAYER_FASTMEMCPY_H
#include "config.h"
#include <inttypes.h>
@@ -105,4 +105,4 @@ static inline void * memcpy_pic2(void * dst, const void * src,
return retval;
}
-#endif /* FASTMEMCPY_H */
+#endif /* MPLAYER_FASTMEMCPY_H */
diff --git a/libvo/font_load.h b/libvo/font_load.h
index 2d24e79023..0c7fe42890 100644
--- a/libvo/font_load.h
+++ b/libvo/font_load.h
@@ -1,5 +1,5 @@
-#ifndef FONT_LOAD_H
-#define FONT_LOAD_H
+#ifndef MPLAYER_FONT_LOAD_H
+#define MPLAYER_FONT_LOAD_H
#ifdef HAVE_FREETYPE
#include <ft2build.h>
@@ -102,4 +102,4 @@ static int kerning(font_desc_t *desc, int prevc, int c) { return 0; }
raw_file* load_raw(char *name,int verbose);
font_desc_t* read_font_desc(const char* fname,float factor,int verbose);
-#endif /* FONT_LOAD_H */
+#endif /* MPLAYER_FONT_LOAD_H */
diff --git a/libvo/geometry.h b/libvo/geometry.h
index da4026a166..50080b3dd0 100644
--- a/libvo/geometry.h
+++ b/libvo/geometry.h
@@ -1,10 +1,10 @@
/* This file (C) Mark Zealey <mark@zealos.org 2002, released under GPL */
-#ifndef GEOMETRY_H
-#define GEOMETRY_H
+#ifndef MPLAYER_GEOMETRY_H
+#define MPLAYER_GEOMETRY_H
extern char *vo_geometry;
extern int geometry_wh_changed;
extern int geometry_xy_changed;
int geometry(int *xpos, int *ypos, int *widw, int *widh, int scrw, int scrh);
-#endif /* GEOMETRY_H */
+#endif /* MPLAYER_GEOMETRY_H */
diff --git a/libvo/gl_common.h b/libvo/gl_common.h
index 5025c0a4e0..8e0d416d48 100644
--- a/libvo/gl_common.h
+++ b/libvo/gl_common.h
@@ -1,5 +1,5 @@
-#ifndef GL_COMMON_H
-#define GL_COMMON_H
+#ifndef MPLAYER_GL_COMMON_H
+#define MPLAYER_GL_COMMON_H
#include "mp_msg.h"
#include "config.h"
@@ -330,4 +330,4 @@ extern int (APIENTRY *SwapInterval)(int);
extern void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei,
GLsizei, GLint, GLenum, GLenum, const GLvoid *);
-#endif /* GL_COMMON_H */
+#endif /* MPLAYER_GL_COMMON_H */
diff --git a/libvo/gtf.h b/libvo/gtf.h
index d898462735..3928ad9be2 100644
--- a/libvo/gtf.h
+++ b/libvo/gtf.h
@@ -1,5 +1,5 @@
-#ifndef GTF_H
-#define GTF_H
+#ifndef MPLAYER_GTF_H
+#define MPLAYER_GTF_H
#include <vbe.h>
@@ -45,4 +45,4 @@ typedef struct {
void GTF_calcTimings(double X,double Y,double freq, int type,
int want_margins, int want_interlace,struct VesaCRTCInfoBlock *result);
-#endif /* GTF_H */
+#endif /* MPLAYER_GTF_H */
diff --git a/libvo/jpeg_enc.h b/libvo/jpeg_enc.h
index 923b431a9b..b518fb4bbf 100644
--- a/libvo/jpeg_enc.h
+++ b/libvo/jpeg_enc.h
@@ -22,8 +22,8 @@
* http://www.ece.purdue.edu/~bourman/grad-labs/lab8/pdf/lab.pdf
*/
-#ifndef JPEG_ENC_H
-#define JPEG_ENC_H
+#ifndef MPLAYER_JPEG_ENC_H
+#define MPLAYER_JPEG_ENC_H
typedef struct {
struct MpegEncContext *s;
@@ -46,4 +46,4 @@ int jpeg_enc_frame(jpeg_enc_t *j, unsigned char *y_data,
void jpeg_enc_uninit(jpeg_enc_t *j);
-#endif /* JPEG_ENC_H */
+#endif /* MPLAYER_JPEG_ENC_H */
diff --git a/libvo/osd_font.h b/libvo/osd_font.h
index 1ba24e9056..99d162060c 100644
--- a/libvo/osd_font.h
+++ b/libvo/osd_font.h
@@ -1,5 +1,5 @@
-#ifndef OSD_FONT_H
-#define OSD_FONT_H
+#ifndef MPLAYER_OSD_FONT_H
+#define MPLAYER_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,
@@ -524,4 +524,4 @@ const unsigned char osd_font_pfb[] = {
0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x0a,
0x80,0x03,};
-#endif /* OSD_FONT_H */
+#endif /* MPLAYER_OSD_FONT_H */
diff --git a/libvo/spuenc.h b/libvo/spuenc.h
index 40692fbfab..3fb3e62e2d 100644
--- a/libvo/spuenc.h
+++ b/libvo/spuenc.h
@@ -19,8 +19,8 @@
*
*/
-#ifndef SPUENC_H
-#define SPUENC_H
+#ifndef MPLAYER_SPUENC_H
+#define MPLAYER_SPUENC_H
#include <stdlib.h>
#define DATASIZE 53220
@@ -42,4 +42,4 @@ typedef struct {
void pixbuf_encode_rle(int x, int y, int w, int h, char *inbuf, int stride, encodedata *ed);
void pixbuf_delete(pixbuf* pb);
-#endif /* SPUENC_H */
+#endif /* MPLAYER_SPUENC_H */
diff --git a/libvo/vesa_lvo.h b/libvo/vesa_lvo.h
index 4a4550c417..51cecbc158 100644
--- a/libvo/vesa_lvo.h
+++ b/libvo/vesa_lvo.h
@@ -9,8 +9,8 @@
* This file contains vo_vesa interface to Linux Video Overlay.
*/
-#ifndef VESA_LVO_H
-#define VESA_LVO_H
+#ifndef MPLAYER_VESA_LVO_H
+#define MPLAYER_VESA_LVO_H
int vlvo_preinit(const char *drvname);
int vlvo_init(unsigned src_width,unsigned src_height,
@@ -24,4 +24,4 @@ uint32_t vlvo_draw_frame(uint8_t *src[]);
void vlvo_flip_page(void);
void vlvo_draw_osd(void);
-#endif /* VESA_LVO_H */
+#endif /* MPLAYER_VESA_LVO_H */
diff --git a/libvo/video_out.h b/libvo/video_out.h
index 958689fc08..48799c484d 100644
--- a/libvo/video_out.h
+++ b/libvo/video_out.h
@@ -7,8 +7,8 @@
*
*/
-#ifndef VIDEO_OUT_H
-#define VIDEO_OUT_H
+#ifndef MPLAYER_VIDEO_OUT_H
+#define MPLAYER_VIDEO_OUT_H
#include <inttypes.h>
#include <stdarg.h>
@@ -255,4 +255,4 @@ extern char *monitor_dotclock_str;
#endif /* defined(HAVE_FBDEV) || defined(HAVE_VESA) */
-#endif /* VIDEO_OUT_H */
+#endif /* MPLAYER_VIDEO_OUT_H */
diff --git a/libvo/video_out_internal.h b/libvo/video_out_internal.h
index 5d51909b95..53fd286957 100644
--- a/libvo/video_out_internal.h
+++ b/libvo/video_out_internal.h
@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef VIDEO_OUT_INTERNAL_H
-#define VIDEO_OUT_INTERNAL_H
+#ifndef MPLAYER_VIDEO_OUT_INTERNAL_H
+#define MPLAYER_VIDEO_OUT_INTERNAL_H
/* All video drivers will want this */
#include "libmpcodecs/vfcap.h"
@@ -57,4 +57,4 @@ static int preinit(const char *);
#include "osd.h"
-#endif /* VIDEO_OUT_INTERNAL_H */
+#endif /* MPLAYER_VIDEO_OUT_INTERNAL_H */
diff --git a/libvo/videodev_mjpeg.h b/libvo/videodev_mjpeg.h
index 9f8c30234c..752eeb104d 100644
--- a/libvo/videodev_mjpeg.h
+++ b/libvo/videodev_mjpeg.h
@@ -3,8 +3,8 @@
<rainer@johanni.de>
*/
-#ifndef VIDEODEV_MJPEG_H
-#define VIDEODEV_MJPEG_H
+#ifndef MPLAYER_VIDEODEV_MJPEG_H
+#define MPLAYER_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) */
@@ -120,4 +120,4 @@ Private IOCTL to set up for displaying MJPEG
#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 */
+#endif /* MPLAYER_VIDEODEV_MJPEG_H */
diff --git a/libvo/vo_quartz.h b/libvo/vo_quartz.h
index 4213eaf2a1..b0e8fece46 100644
--- a/libvo/vo_quartz.h
+++ b/libvo/vo_quartz.h
@@ -26,8 +26,8 @@
slouken@libsdl.org
*/
-#ifndef VO_QUARTZ_H
-#define VO_QUARTZ_H
+#ifndef MPLAYER_VO_QUARTZ_H
+#define MPLAYER_VO_QUARTZ_H
/* These are the Macintosh key scancode constants -- from Inside Macintosh */
#define QZ_ESCAPE 0x35
@@ -149,4 +149,4 @@
#define QZ_IBOOK_DOWN 0x3D
#define QZ_IBOOK_UP 0x3E
-#endif /* VO_QUARTZ_H */
+#endif /* MPLAYER_VO_QUARTZ_H */
diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h
index acd0bc45a6..a1d31285b9 100644
--- a/libvo/vosub_vidix.h
+++ b/libvo/vosub_vidix.h
@@ -9,8 +9,8 @@
* This file contains vosub_vidix interface to any mplayer's VO driver
*/
-#ifndef VOSUB_VIDIX_H
-#define VOSUB_VIDIX_H
+#ifndef MPLAYER_VOSUB_VIDIX_H
+#define MPLAYER_VOSUB_VIDIX_H
/* drvname can be NULL */
int vidix_preinit(const char *drvname,vo_functions_t *server);
@@ -35,4 +35,4 @@ int vidix_grkey_support(void);
int vidix_grkey_get(vidix_grkey_t *gr_key);
int vidix_grkey_set(const vidix_grkey_t *gr_key);
-#endif /* VOSUB_VIDIX_H */
+#endif /* MPLAYER_VOSUB_VIDIX_H */
diff --git a/libvo/w32_common.h b/libvo/w32_common.h
index 0787677207..449fd0d98e 100644
--- a/libvo/w32_common.h
+++ b/libvo/w32_common.h
@@ -1,5 +1,5 @@
-#ifndef W32_COMMON_H
-#define W32_COMMON_H
+#ifndef MPLAYER_W32_COMMON_H
+#define MPLAYER_W32_COMMON_H
extern HWND vo_w32_window;
extern int vo_vm;
@@ -14,4 +14,4 @@ extern int vo_w32_config(uint32_t, uint32_t, uint32_t);
extern void destroyRenderingContext(void);
extern void w32_update_xinerama_info(void);
-#endif /* W32_COMMON_H */
+#endif /* MPLAYER_W32_COMMON_H */
diff --git a/libvo/wskeys.h b/libvo/wskeys.h
index 194ce10f0d..f226ccc2e9 100644
--- a/libvo/wskeys.h
+++ b/libvo/wskeys.h
@@ -1,6 +1,6 @@
-#ifndef WSKEYS_H
-#define WSKEYS_H
+#ifndef MPLAYER_WSKEYS_H
+#define MPLAYER_WSKEYS_H
#define wsosbrackets '['
#define wscsbrackets ']'
@@ -152,4 +152,4 @@
#define wsGrayInsert 0x9e + 256
#define wsGrayDelete 0x9f + 256
-#endif /* WSKEYS_H */
+#endif /* MPLAYER_WSKEYS_H */
diff --git a/libvo/x11_common.h b/libvo/x11_common.h
index dc3a9fbd3d..2c52eb3163 100644
--- a/libvo/x11_common.h
+++ b/libvo/x11_common.h
@@ -1,6 +1,5 @@
-
-#ifndef X11_COMMON_H
-#define X11_COMMON_H
+#ifndef MPLAYER_X11_COMMON_H
+#define MPLAYER_X11_COMMON_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -123,4 +122,4 @@ void update_xinerama_info(void);
int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return);
-#endif /* X11_COMMON_H */
+#endif /* MPLAYER_X11_COMMON_H */
diff --git a/m_config.h b/m_config.h
index 5c7f1d26f5..e6b8bc9247 100644
--- a/m_config.h
+++ b/m_config.h
@@ -1,5 +1,5 @@
-#ifndef M_CONFIG_H
-#define M_CONFIG_H
+#ifndef MPLAYER_M_CONFIG_H
+#define MPLAYER_M_CONFIG_H
/// \defgroup Config Config manager
///
@@ -206,4 +206,4 @@ m_config_set_profile(m_config_t* config, m_profile_t* p);
///@}
-#endif /* M_CONFIG_H */
+#endif /* MPLAYER_M_CONFIG_H */
diff --git a/m_option.h b/m_option.h
index 7c5d2efa91..d6b9cd0331 100644
--- a/m_option.h
+++ b/m_option.h
@@ -1,5 +1,5 @@
-#ifndef M_OPTION_H
-#define M_OPTION_H
+#ifndef MPLAYER_M_OPTION_H
+#define MPLAYER_M_OPTION_H
/// \defgroup Options
/// m_option allows to parse, print and copy data of various types.
@@ -500,4 +500,4 @@ m_option_free(const m_option_t* opt,void* dst) {
/*@}*/
-#endif /* M_OPTION_H */
+#endif /* MPLAYER_M_OPTION_H */
diff --git a/m_property.h b/m_property.h
index c46a36fe9b..3bf8be55dc 100644
--- a/m_property.h
+++ b/m_property.h
@@ -1,5 +1,5 @@
-#ifndef M_PROPERTY_H
-#define M_PROPERTY_H
+#ifndef MPLAYER_M_PROPERTY_H
+#define MPLAYER_M_PROPERTY_H
/// \defgroup Properties
///
@@ -201,4 +201,4 @@ int m_property_bitrate(const m_option_t* prop,int action,void* arg,int rate);
///@}
-#endif /* M_PROPERTY_H */
+#endif /* MPLAYER_M_PROPERTY_H */
diff --git a/m_struct.h b/m_struct.h
index af623ccd5e..57bf46f603 100644
--- a/m_struct.h
+++ b/m_struct.h
@@ -1,5 +1,5 @@
-#ifndef M_STRUCT_H
-#define M_STRUCT_H
+#ifndef MPLAYER_M_STRUCT_H
+#define MPLAYER_M_STRUCT_H
/// \defgroup OptionsStruct Options struct
/// \ingroup Options
@@ -105,4 +105,4 @@ m_struct_get_field(const m_struct_t* st,const char* f);
///@}
-#endif /* M_STRUCT_H */
+#endif /* MPLAYER_M_STRUCT_H */
diff --git a/mangle.h b/mangle.h
index 1a3368adcc..687ca4f4ac 100644
--- a/mangle.h
+++ b/mangle.h
@@ -4,8 +4,8 @@
* File licensed under the GPL, see http://www.fsf.org/ for more info.
*/
-#ifndef MANGLE_H
-#define MANGLE_H
+#ifndef MPLAYER_MANGLE_H
+#define MPLAYER_MANGLE_H
/* Feel free to add more to the list, eg. a.out IMO */
#if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \
@@ -15,4 +15,4 @@
#define MANGLE(a) #a
#endif
-#endif /* MANGLE_H */
+#endif /* MPLAYER_MANGLE_H */
diff --git a/metadata.h b/metadata.h
index 5c0451b04c..6cd75ea3e0 100644
--- a/metadata.h
+++ b/metadata.h
@@ -17,8 +17,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef METADATA_H
-#define METADATA_H
+#ifndef MPLAYER_METADATA_H
+#define MPLAYER_METADATA_H
typedef enum metadata_s metadata_t;
enum metadata_s {
@@ -47,5 +47,5 @@ enum metadata_s {
char *get_metadata (metadata_t type);
-#endif /* METADATA_H */
+#endif /* MPLAYER_METADATA_H */
diff --git a/mp_core.h b/mp_core.h
index 4bf612db64..b7ed8e6a99 100644
--- a/mp_core.h
+++ b/mp_core.h
@@ -1,5 +1,5 @@
-#ifndef MP_CORE_H
-#define MP_CORE_H
+#ifndef MPLAYER_MP_CORE_H
+#define MPLAYER_MP_CORE_H
#include "mp_osd.h"
@@ -120,4 +120,4 @@ void exit_player_with_rc(const char* how, int rc);
void add_subtitles(char *filename, float fps, int noerr);
int reinit_video_chain(void);
-#endif /* MP_CORE_H */
+#endif /* MPLAYER_MP_CORE_H */
diff --git a/mp_fifo.h b/mp_fifo.h
index 1605da03af..5a5c925462 100644
--- a/mp_fifo.h
+++ b/mp_fifo.h
@@ -1,7 +1,7 @@
-#ifndef MP_FIFO_H
-#define MP_FIFO_H
+#ifndef MPLAYER_MP_FIFO_H
+#define MPLAYER_MP_FIFO_H
int mplayer_get_key(int fd);
void mplayer_put_key(int code);
-#endif /* MP_FIFO_H */
+#endif /* MPLAYER_MP_FIFO_H */
diff --git a/mp_msg.h b/mp_msg.h
index 816c10132e..07ff6b8ca6 100644
--- a/mp_msg.h
+++ b/mp_msg.h
@@ -1,6 +1,5 @@
-
-#ifndef MP_MSG_H
-#define MP_MSG_H
+#ifndef MPLAYER_MP_MSG_H
+#define MPLAYER_MP_MSG_H
// defined in mplayer.c and mencoder.c
extern int verbose;
@@ -138,4 +137,4 @@ const char* filename_recode(const char* filename);
#endif /* TARGET_OS2 */
-#endif /* MP_MSG_H */
+#endif /* MPLAYER_MP_MSG_H */
diff --git a/mp_osd.h b/mp_osd.h
index f6151e2dbc..f3b2a69561 100644
--- a/mp_osd.h
+++ b/mp_osd.h
@@ -1,5 +1,5 @@
-#ifndef MP_OSD_H
-#define MP_OSD_H
+#ifndef MPLAYER_MP_OSD_H
+#define MPLAYER_MP_OSD_H
#define OSD_MSG_TV_CHANNEL 0
#define OSD_MSG_TEXT 1
@@ -23,4 +23,4 @@ void set_osd_bar(int type,const char* name,double min,double max,double val);
void set_osd_msg(int id, int level, int time, const char* fmt, ...);
void rm_osd_msg(int id);
-#endif /* MP_OSD_H */
+#endif /* MPLAYER_MP_OSD_H */
diff --git a/mpbswap.h b/mpbswap.h
index 4171539cda..afd1470e77 100644
--- a/mpbswap.h
+++ b/mpbswap.h
@@ -1,9 +1,9 @@
-#ifndef MPBSWAP_H
-#define MPBSWAP_H
+#ifndef MPLAYER_MPBSWAP_H
+#define MPLAYER_MPBSWAP_H
#include "libavutil/bswap.h"
#ifndef HAVE_SWAB
void swab(const void *from, void *to, ssize_t n);
#endif
-#endif /* MPBSWAP_H */
+#endif /* MPLAYER_MPBSWAP_H */
diff --git a/mpcommon.h b/mpcommon.h
index ba7881f71d..757f3216df 100644
--- a/mpcommon.h
+++ b/mpcommon.h
@@ -1,5 +1,5 @@
-#ifndef MPCOMMON_H
-#define MPCOMMON_H
+#ifndef MPLAYER_MPCOMMON_H
+#define MPLAYER_MPCOMMON_H
extern double sub_last_pts;
extern struct ass_track_s *ass_track;
@@ -7,4 +7,4 @@ extern subtitle *vo_sub_last;
void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset);
void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset);
-#endif /* MPCOMMON_H */
+#endif /* MPLAYER_MPCOMMON_H */
diff --git a/mplayer.h b/mplayer.h
index 9811718140..0157543177 100644
--- a/mplayer.h
+++ b/mplayer.h
@@ -1,6 +1,6 @@
-#ifndef MPLAYER_H
-#define MPLAYER_H
+#ifndef MPLAYER_MPLAYER_H
+#define MPLAYER_MPLAYER_H
extern char* current_module;
@@ -50,4 +50,4 @@ extern int vobsub_id;
extern void exit_player(const char* how);
extern void update_set_of_subtitles(void);
-#endif /* MPLAYER_H */
+#endif /* MPLAYER_MPLAYER_H */
diff --git a/osdep/getch2.h b/osdep/getch2.h
index c2e14aa5ee..b91bd7176d 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -1,8 +1,8 @@
/* GyS-TermIO v2.0 (for GySmail v3) (C) 1999 A'rpi/ESP-team */
/* a very small replacement of ncurses library */
-#ifndef GETCH2_H
-#define GETCH2_H
+#ifndef MPLAYER_GETCH2_H
+#define MPLAYER_GETCH2_H
/* Screen size. Initialized by load_termcap() and get_screen_size() */
extern int screen_width;
@@ -35,4 +35,4 @@ extern int mp_input_slave_cmd_func(int fd,char* dest,int size);
#define MP_INPUT_SLAVE_CMD_FUNC NULL
#endif
-#endif /* GETCH2_H */
+#endif /* MPLAYER_GETCH2_H */
diff --git a/osdep/glob.h b/osdep/glob.h
index 57a2d1f949..6f6599ed7f 100644
--- a/osdep/glob.h
+++ b/osdep/glob.h
@@ -1,5 +1,5 @@
-#ifndef GLOB_H
-#define GLOB_H
+#ifndef MPLAYER_GLOB_H
+#define MPLAYER_GLOB_H
#include "config.h"
@@ -13,4 +13,4 @@ void globfree(glob_t *pglob);
int glob(const char *pattern, int flags, int (*errfunc)(const char *epath, int eerrno), glob_t *pglob);
-#endif /* GLOB_H */
+#endif /* MPLAYER_GLOB_H */
diff --git a/osdep/keycodes.h b/osdep/keycodes.h
index fdd6343f78..d7e4e785c0 100644
--- a/osdep/keycodes.h
+++ b/osdep/keycodes.h
@@ -1,7 +1,7 @@
/* KEY code definitions for GyS-TermIO v2.0 (C) 1999 A'rpi/ESP-team */
-#ifndef KEYCODES_H
-#define KEYCODES_H
+#ifndef MPLAYER_KEYCODES_H
+#define MPLAYER_KEYCODES_H
#define KEY_ENTER 13
#define KEY_TAB 9
@@ -74,4 +74,4 @@
#define KEY_INTERN (0x1000)
#define KEY_CLOSE_WIN (KEY_INTERN+0)
-#endif /* KEYCODES_H */
+#endif /* MPLAYER_KEYCODES_H */
diff --git a/osdep/mmap_anon.h b/osdep/mmap_anon.h
index 7845a9bc05..f8712ca628 100644
--- a/osdep/mmap_anon.h
+++ b/osdep/mmap_anon.h
@@ -1,8 +1,8 @@
-#ifndef MMAP_ANON_H
-#define MMAP_ANON_H
+#ifndef MPLAYER_MMAP_ANON_H
+#define MPLAYER_MMAP_ANON_H
#include <sys/types.h>
void *mmap_anon(void *, size_t, int, int, off_t);
-#endif /* MMAP_ANON_H */
+#endif /* MPLAYER_MMAP_ANON_H */
diff --git a/osdep/shmem.h b/osdep/shmem.h
index 8d71288b97..bdfcb5c474 100644
--- a/osdep/shmem.h
+++ b/osdep/shmem.h
@@ -1,7 +1,7 @@
-#ifndef SHMEM_H
-#define SHMEM_H
+#ifndef MPLAYER_SHMEM_H
+#define MPLAYER_SHMEM_H
void* shmem_alloc(int size);
void shmem_free(void* p,int size);
-#endif /* SHMEM_H */
+#endif /* MPLAYER_SHMEM_H */
diff --git a/parser-cfg.h b/parser-cfg.h
index 8a54cc9353..8b9125b8a6 100644
--- a/parser-cfg.h
+++ b/parser-cfg.h
@@ -1,6 +1,6 @@
-#ifndef PARSER_CFG_H
-#define PARSER_CFG_H
+#ifndef MPLAYER_PARSER_CFG_H
+#define MPLAYER_PARSER_CFG_H
extern int m_config_parse_config_file(m_config_t* config, char *conffile);
-#endif /* PARSER_CFG_H */
+#endif /* MPLAYER_PARSER_CFG_H */
diff --git a/parser-mecmd.h b/parser-mecmd.h
index 7323b16ee5..aeb96d94ca 100644
--- a/parser-mecmd.h
+++ b/parser-mecmd.h
@@ -1,5 +1,5 @@
-#ifndef PARSER_MECMD_H
-#define PARSER_MECMD_H
+#ifndef MPLAYER_PARSER_MECMD_H
+#define MPLAYER_PARSER_MECMD_H
/// \file
/// \ingroup ConfigParsers MEntry
@@ -32,4 +32,4 @@ m_config_parse_me_command_line(m_config_t *config, int argc, char **argv);
///@}
-#endif /* PARSER_MECMD_H */
+#endif /* MPLAYER_PARSER_MECMD_H */
diff --git a/parser-mpcmd.h b/parser-mpcmd.h
index de5aa5a549..1e7b45e8db 100644
--- a/parser-mpcmd.h
+++ b/parser-mpcmd.h
@@ -1,6 +1,6 @@
-#ifndef PARSER_MPCMD_H
-#define PARSER_MPCMD_H
+#ifndef MPLAYER_PARSER_MPCMD_H
+#define MPLAYER_PARSER_MPCMD_H
extern play_tree_t* m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv);
-#endif /* PARSER_MPCMD_H */
+#endif /* MPLAYER_PARSER_MPCMD_H */
diff --git a/playtree.h b/playtree.h
index a5132caf61..7e454ad1fa 100644
--- a/playtree.h
+++ b/playtree.h
@@ -1,10 +1,9 @@
+#ifndef MPLAYER_PLAYTREE_H
+#define MPLAYER_PLAYTREE_H
/// \file
/// \ingroup Playtree
-#ifndef PLAYTREE_H
-#define PLAYTREE_H
-
struct stream_st;
struct m_config;
@@ -282,6 +281,6 @@ void pt_iter_goto_head(play_tree_iter_t* iter);
///@}
-#endif /* PLAYTREE_H */
-
///@}
+
+#endif /* MPLAYER_PLAYTREE_H */
diff --git a/playtreeparser.h b/playtreeparser.h
index 94b4461d6c..52701179e4 100644
--- a/playtreeparser.h
+++ b/playtreeparser.h
@@ -1,3 +1,5 @@
+#ifndef MPLAYER_PLAYTREEPARSER_H
+#define MPLAYER_PLAYTREEPARSER_H
/// \defgroup PlaytreeParser Playtree parser
/// \ingroup Playtree
@@ -8,9 +10,6 @@
/// \file
-#ifndef PLAYTREEPARSER_H
-#define PLAYTREEPARSER_H
-
struct stream_st;
typedef struct play_tree_parser {
@@ -47,6 +46,6 @@ play_tree_parser_get_play_tree(play_tree_parser_t* p, int forced);
void
play_tree_add_bpf(play_tree_t* pt, char* filename);
-#endif /* PLAYTREEPARSER_H */
-
///@}
+
+#endif /* MPLAYER_PLAYTREEPARSER_H */
diff --git a/stream/audio_in.h b/stream/audio_in.h
index 643b7d5ac3..97bd534433 100644
--- a/stream/audio_in.h
+++ b/stream/audio_in.h
@@ -1,5 +1,5 @@
-#ifndef AUDIO_IN_H
-#define AUDIO_IN_H
+#ifndef MPLAYER_AUDIO_IN_H
+#define MPLAYER_AUDIO_IN_H
#define AUDIO_IN_ALSA 1
#define AUDIO_IN_OSS 2
@@ -72,4 +72,4 @@ int ai_oss_set_channels(audio_in_t *ai);
int ai_oss_init(audio_in_t *ai);
#endif
-#endif /* AUDIO_IN_H */
+#endif /* MPLAYER_AUDIO_IN_H */
diff --git a/stream/cache2.h b/stream/cache2.h
index 924202735f..99f0378d75 100644
--- a/stream/cache2.h
+++ b/stream/cache2.h
@@ -1,6 +1,6 @@
-#ifndef CACHE2_H
-#define CACHE2_H
+#ifndef MPLAYER_CACHE2_H
+#define MPLAYER_CACHE2_H
extern void cache_uninit(stream_t *s);
-#endif /* CACHE2_H */
+#endif /* MPLAYER_CACHE2_H */
diff --git a/stream/cdd.h b/stream/cdd.h
index bab1035545..10fb64763f 100644
--- a/stream/cdd.h
+++ b/stream/cdd.h
@@ -1,5 +1,5 @@
-#ifndef CDD_H
-#define CDD_H
+#ifndef MPLAYER_CDD_H
+#define MPLAYER_CDD_H
#include "config.h"
#ifndef HAVE_LIBCDIO
@@ -74,4 +74,4 @@ cd_track_t* cd_info_get_track(cd_info_t *cd_info, unsigned int track_nb);
void cd_info_debug(cd_info_t *cd_info);
-#endif /* CDD_H */
+#endif /* MPLAYER_CDD_H */
diff --git a/stream/cookies.h b/stream/cookies.h
index 4f5c4f7511..f1619110ce 100644
--- a/stream/cookies.h
+++ b/stream/cookies.h
@@ -5,12 +5,12 @@
* by Dave Lambley <mplayer@davel.me.uk>
*/
-#ifndef COOKIES_H
-#define COOKIES_H
+#ifndef MPLAYER_COOKIES_H
+#define MPLAYER_COOKIES_H
#include "http.h"
extern void cookies_set(HTTP_header_t * http_hdr, const char *hostname,
const char *url);
-#endif /* COOKIES_H */
+#endif /* MPLAYER_COOKIES_H */
diff --git a/stream/dvbin.h b/stream/dvbin.h
index 31c4d6b383..c24832c4d2 100644
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@@ -5,8 +5,8 @@
* $Id$
*/
-#ifndef DVBIN_H
-#define DVBIN_H
+#ifndef MPLAYER_DVBIN_H
+#define MPLAYER_DVBIN_H
#include "stream.h"
@@ -113,4 +113,4 @@ extern int dvb_set_channel(stream_t *, int, int);
extern dvb_config_t *dvb_get_config(void);
extern void dvb_free_config(dvb_config_t *config);
-#endif /* DVBIN_H */
+#endif /* MPLAYER_DVBIN_H */
diff --git a/stream/frequencies.h b/stream/frequencies.h
index 234a2adb86..bf822d468b 100644
--- a/stream/frequencies.h
+++ b/stream/frequencies.h
@@ -6,8 +6,8 @@
* Frequencies are given in kHz
*/
-#ifndef FREQUENCIES_H
-#define FREQUENCIES_H
+#ifndef MPLAYER_FREQUENCIES_H
+#define MPLAYER_FREQUENCIES_H
#define NTSC_AUDIO_CARRIER 4500
#define PAL_AUDIO_CARRIER_I 6000
@@ -114,4 +114,4 @@ extern int chantab;
extern const struct CHANLIST *chanlist;
extern int chancount;
-#endif /* FREQUENCIES_H */
+#endif /* MPLAYER_FREQUENCIES_H */
diff --git a/stream/http.h b/stream/http.h
index 573da81b05..0cb3752e11 100644
--- a/stream/http.h
+++ b/stream/http.h
@@ -4,8 +4,8 @@
* (C) 2001, MPlayer team.
*/
-#ifndef HTTP_H
-#define HTTP_H
+#ifndef MPLAYER_HTTP_H
+#define MPLAYER_HTTP_H
typedef struct HTTP_field_type {
char *field_name;
@@ -49,4 +49,4 @@ int http_add_basic_authentication( HTTP_header_t *http_hdr, const char *usernam
void http_debug_hdr( HTTP_header_t *http_hdr );
int base64_encode(const void *enc, int encLen, char *out, int outMax);
-#endif /* HTTP_H */
+#endif /* MPLAYER_HTTP_H */
diff --git a/stream/librtsp/rtsp.h b/stream/librtsp/rtsp.h
index bc6a4f52a1..528dacaa42 100644
--- a/stream/librtsp/rtsp.h
+++ b/stream/librtsp/rtsp.h
@@ -29,8 +29,8 @@
* fixed a lot of RFC compliance issues.
*/
-#ifndef RTSP_H
-#define RTSP_H
+#ifndef MPLAYER_RTSP_H
+#define MPLAYER_RTSP_H
/* some codes returned by rtsp_request_* functions */
@@ -80,4 +80,4 @@ void rtsp_schedule_field(rtsp_t *s, const char *string);
void rtsp_unschedule_field(rtsp_t *s, const char *string);
void rtsp_unschedule_all(rtsp_t *s);
-#endif /* RTSP_H */
+#endif /* MPLAYER_RTSP_H */
diff --git a/stream/librtsp/rtsp_rtp.h b/stream/librtsp/rtsp_rtp.h
index 15cddf6c7e..ffdc806add 100644
--- a/stream/librtsp/rtsp_rtp.h
+++ b/stream/librtsp/rtsp_rtp.h
@@ -18,8 +18,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef RTSP_RTP_H
-#define RTSP_RTP_H
+#ifndef MPLAYER_RTSP_RTP_H
+#define MPLAYER_RTSP_RTP_H
#include "rtsp.h"
@@ -37,5 +37,5 @@ off_t rtp_read (struct rtp_rtsp_session_t* st, char *buf, off_t length);
void rtp_session_free (struct rtp_rtsp_session_t *st);
void rtcp_send_rr (rtsp_t *s, struct rtp_rtsp_session_t *st);
-#endif /* RTSP_RTP_H */
+#endif /* MPLAYER_RTSP_RTP_H */
diff --git a/stream/librtsp/rtsp_session.h b/stream/librtsp/rtsp_session.h
index da2ede77ab..53f0f3ea10 100644
--- a/stream/librtsp/rtsp_session.h
+++ b/stream/librtsp/rtsp_session.h
@@ -28,8 +28,8 @@
* Support for MPEG-TS streaming through RFC compliant RTSP servers
*/
-#ifndef HAVE_RTSP_SESSION_H
-#define HAVE_RTSP_SESSION_H
+#ifndef MPLAYER_RTSP_SESSION_H
+#define MPLAYER_RTSP_SESSION_H
typedef struct rtsp_session_s rtsp_session_t;
@@ -40,4 +40,4 @@ int rtsp_session_read(rtsp_session_t *session, char *data, int len);
void rtsp_session_end(rtsp_session_t *session);
-#endif /* HAVE_RTSP_SESSION_H */
+#endif /* MPLAYER_RTSP_SESSION_H */
diff --git a/stream/netstream.h b/stream/netstream.h
index 75fe94cdd5..e092ef126c 100644
--- a/stream/netstream.h
+++ b/stream/netstream.h
@@ -7,8 +7,8 @@
* Data is always low endian
*/
-#ifndef NETSTREAM_H
-#define NETSTREAM_H
+#ifndef MPLAYER_NETSTREAM_H
+#define MPLAYER_NETSTREAM_H
typedef struct mp_net_stream_packet_st {
uint16_t len;
@@ -138,4 +138,4 @@ static void net_stream_opened_2_me(mp_net_stream_opened_t* o) {
o->end_pos = le2me_64(o->end_pos);
}
-#endif /* NETSTREAM_H */
+#endif /* MPLAYER_NETSTREAM_H */
diff --git a/stream/network.h b/stream/network.h
index 37ee0e9a4b..ef5fa2dceb 100644
--- a/stream/network.h
+++ b/stream/network.h
@@ -4,8 +4,8 @@
* (C) 2001, MPlayer team.
*/
-#ifndef NETWORK_H
-#define NETWORK_H
+#ifndef MPLAYER_NETWORK_H
+#define MPLAYER_NETWORK_H
#include <fcntl.h>
#include <sys/time.h>
@@ -63,4 +63,4 @@ HTTP_header_t *http_read_response(int fd);
int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry);
URL_t* check4proxies(URL_t *url);
-#endif /* NETWORK_H */
+#endif /* MPLAYER_NETWORK_H */
diff --git a/stream/pnm.h b/stream/pnm.h
index 3654e652e8..42b4388a53 100644
--- a/stream/pnm.h
+++ b/stream/pnm.h
@@ -22,8 +22,8 @@
* pnm util functions header by joschka
*/
-#ifndef PNM_H
-#define PNM_H
+#ifndef MPLAYER_PNM_H
+#define MPLAYER_PNM_H
#include <inttypes.h>
/*#include "xine_internal.h" */
@@ -34,4 +34,4 @@ typedef struct pnm_s pnm_t;
//int pnm_read (pnm_t *this, char *data, int len);
-#endif /* PNM_H */
+#endif /* MPLAYER_PNM_H */
diff --git a/stream/pvr.h b/stream/pvr.h
index 259aa829e9..f358e89018 100644
--- a/stream/pvr.h
+++ b/stream/pvr.h
@@ -21,8 +21,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PVR_H
-#define PVR_H
+#ifndef MPLAYER_PVR_H
+#define MPLAYER_PVR_H
#include "tv.h"
@@ -84,4 +84,4 @@ int pvr_set_channel_step (stream_t *stream, int step);
*/
int pvr_force_freq_step (stream_t *stream, int step);
-#endif /* PVR_H */
+#endif /* MPLAYER_PVR_H */
diff --git a/stream/realrtsp/asmrp.h b/stream/realrtsp/asmrp.h
index ac647011f1..b5616db59a 100644
--- a/stream/realrtsp/asmrp.h
+++ b/stream/realrtsp/asmrp.h
@@ -37,11 +37,11 @@
*/
-#ifndef ASMRP_H
-#define ASMRP_H
+#ifndef MPLAYER_ASMRP_H
+#define MPLAYER_ASMRP_H
#define MAX_RULEMATCHES 16
int asmrp_match (const char *rules, int bandwidth, int *matches) ;
-#endif /* ASMRP_H */
+#endif /* MPLAYER_ASMRP_H */
diff --git a/stream/realrtsp/real.h b/stream/realrtsp/real.h
index fd78edfc78..37ac03b28e 100644
--- a/stream/realrtsp/real.h
+++ b/stream/realrtsp/real.h
@@ -27,8 +27,8 @@
*
*/
-#ifndef HAVE_REAL_H
-#define HAVE_REAL_H
+#ifndef MPLAYER_REAL_H
+#define MPLAYER_REAL_H
#include "rmff.h"
#include "../librtsp/rtsp.h"
@@ -57,4 +57,4 @@ rmff_header_t *real_setup_and_get_header(rtsp_t *rtsp_session, uint32_t bandwidt
struct real_rtsp_session_t *init_real_rtsp_session (void);
void free_real_rtsp_session (struct real_rtsp_session_t* real_session);
-#endif /* HAVE_REAL_H */
+#endif /* MPLAYER_REAL_H */
diff --git a/stream/realrtsp/rmff.h b/stream/realrtsp/rmff.h
index 807c05e2ce..639b8522bb 100644
--- a/stream/realrtsp/rmff.h
+++ b/stream/realrtsp/rmff.h
@@ -26,6 +26,9 @@
* adopted from joschkas real tools
*/
+#ifndef MPLAYER_RMFF_H
+#define MPLAYER_RMFF_H
+
#include <sys/types.h>
#include "config.h"
#ifndef HAVE_WINSOCK2
@@ -43,10 +46,6 @@
#include <inttypes.h>
-#ifndef HAVE_RMFF_H
-#define HAVE_RMFF_H
-
-
#define RMFF_HEADER_SIZE 0x12
#define RMFF_FILEHEADER_SIZE 18
@@ -273,4 +272,4 @@ void rmff_dump_pheader(rmff_pheader_t *h, char *data);
*/
void rmff_free_header(rmff_header_t *h);
-#endif /* HAVE_RMFF_H */
+#endif /* MPLAYER_RMFF_H */
diff --git a/stream/realrtsp/sdpplin.h b/stream/realrtsp/sdpplin.h
index 24a7f206a4..ff79c49775 100644
--- a/stream/realrtsp/sdpplin.h
+++ b/stream/realrtsp/sdpplin.h
@@ -25,9 +25,9 @@
* sdp/sdpplin parser.
*
*/
-
-#ifndef HAVE_SDPPLIN_H
-#define HAVE_SDPPLIN_H
+
+#ifndef MPLAYER_SDPPLIN_H
+#define MPLAYER_SDPPLIN_H
#include "rmff.h"
#include "../librtsp/rtsp.h"
@@ -105,4 +105,4 @@ sdpplin_t *sdpplin_parse(char *data);
void sdpplin_free(sdpplin_t *description);
-#endif /* HAVE_SDPPLIN_H */
+#endif /* MPLAYER_SDPPLIN_H */
diff --git a/stream/realrtsp/xbuffer.h b/stream/realrtsp/xbuffer.h
index 84d91a8dc3..f311290d7e 100644
--- a/stream/realrtsp/xbuffer.h
+++ b/stream/realrtsp/xbuffer.h
@@ -13,9 +13,8 @@
*
*/
-
-#ifndef XBUFFER_H
-#define XBUFFER_H
+#ifndef MPLAYER_XBUFFER_H
+#define MPLAYER_XBUFFER_H
void *xbuffer_init(int chunk_size);
void *xbuffer_free(void *buf);
@@ -23,4 +22,4 @@ void *xbuffer_copyin(void *buf, int index, const void *data, int len);
void *xbuffer_ensure_size(void *buf, int size);
void *xbuffer_strcat(void *buf, char *data);
-#endif /* XBUFFER_H */
+#endif /* MPLAYER_XBUFFER_H */
diff --git a/stream/rtp.h b/stream/rtp.h
index c451536414..d35ae4753d 100644
--- a/stream/rtp.h
+++ b/stream/rtp.h
@@ -5,9 +5,9 @@
* $Id$
*/
-#ifndef RTP_H
-#define RTP_H
+#ifndef MPLAYER_RTP_H
+#define MPLAYER_RTP_H
int read_rtp_from_server(int fd, char *buffer, int length);
-#endif /* RTP_H */
+#endif /* MPLAYER_RTP_H */
diff --git a/stream/stream.h b/stream/stream.h
index b97d72584f..5ef7df5fa0 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -1,5 +1,5 @@
-#ifndef STREAM_H
-#define STREAM_H
+#ifndef MPLAYER_STREAM_H
+#define MPLAYER_STREAM_H
#include "mp_msg.h"
#include <string.h>
@@ -311,4 +311,4 @@ typedef struct {
int channels;
} stream_language_t;
-#endif /* STREAM_H */
+#endif /* MPLAYER_STREAM_H */
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index 020c45f8b7..de3661c564 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -1,5 +1,5 @@
-#ifndef STREAM_DVD_H
-#define STREAM_DVD_H
+#ifndef MPLAYER_STREAM_DVD_H
+#define MPLAYER_STREAM_DVD_H
#ifdef USE_DVDREAD_INTERNAL
#include "dvdread/dvd_reader.h"
@@ -48,4 +48,4 @@ int dvd_aid_from_lang(stream_t *stream, unsigned char* lang);
int dvd_sid_from_lang(stream_t *stream, unsigned char* lang);
int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell);
-#endif /* STREAM_DVD_H */
+#endif /* MPLAYER_STREAM_DVD_H */
diff --git a/stream/stream_dvd_common.h b/stream/stream_dvd_common.h
index 30a2a10fbc..b1e64172e5 100644
--- a/stream/stream_dvd_common.h
+++ b/stream/stream_dvd_common.h
@@ -1,6 +1,6 @@
-#ifndef STREAM_DVD_COMMON_H
-#define STREAM_DVD_COMMON_H
+#ifndef MPLAYER_STREAM_DVD_COMMON_H
+#define MPLAYER_STREAM_DVD_COMMON_H
int mp_dvdtimetomsec(dvd_time_t *dt);
-#endif /* STREAM_DVD_COMMON_H */
+#endif /* MPLAYER_STREAM_DVD_COMMON_H */
diff --git a/stream/stream_radio.h b/stream/stream_radio.h
index c04ec48483..726de124ac 100644
--- a/stream/stream_radio.h
+++ b/stream/stream_radio.h
@@ -1,5 +1,5 @@
-#ifndef STREAM_RADIO_H
-#define STREAM_RADIO_H
+#ifndef MPLAYER_STREAM_RADIO_H
+#define MPLAYER_STREAM_RADIO_H
#define RADIO_CHANNEL_LOWER 1
#define RADIO_CHANNEL_HIGHER 2
@@ -41,4 +41,4 @@ int radio_set_channel(struct stream_st *stream, char *channel);
int radio_step_channel(struct stream_st *stream, int direction);
int radio_step_freq(struct stream_st *stream, float step_interval);
-#endif
+#endif /* MPLAYER_STREAM_RADIO_H */
diff --git a/stream/tcp.h b/stream/tcp.h
index 7299f20fc3..bb3b118025 100644
--- a/stream/tcp.h
+++ b/stream/tcp.h
@@ -19,8 +19,8 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef TCP_H
-#define TCP_H
+#ifndef MPLAYER_TCP_H
+#define MPLAYER_TCP_H
/* Connect to a server using a TCP connection */
int connect2Server (char *host, int port, int verb);
@@ -29,4 +29,4 @@ int connect2Server (char *host, int port, int verb);
#define TCP_ERROR_FATAL -2 /* unable to resolve name */
#define TCP_ERROR_PORT -1 /* unable to connect to a particular port */
-#endif /* TCP_H */
+#endif /* MPLAYER_TCP_H */
diff --git a/stream/tv.h b/stream/tv.h
index a09df2c076..7413860ae0 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -1,5 +1,5 @@
-#ifndef TV_H
-#define TV_H
+#ifndef MPLAYER_TV_H
+#define MPLAYER_TV_H
//#include "libao2/afmt.h"
//#include "libmpcodecs/img_format.h"
@@ -344,4 +344,4 @@ typedef struct tt_stream_props_s{
int bufsize; ///< required buffer size
} tt_stream_props;
-#endif /* TV_H */
+#endif /* MPLAYER_TV_H */
diff --git a/stream/tvi_def.h b/stream/tvi_def.h
index 19a9d9d08a..d12b8fbc34 100644
--- a/stream/tvi_def.h
+++ b/stream/tvi_def.h
@@ -1,5 +1,5 @@
-#ifndef TVI_DEF_H
-#define TVI_DEF_H
+#ifndef MPLAYER_TVI_DEF_H
+#define MPLAYER_TVI_DEF_H
#include <stdlib.h> /* malloc */
#include <string.h> /* memset */
@@ -107,4 +107,4 @@ static inline void fill_blank_frame(char* buffer,int len,int fmt){
}
}
-#endif /* TVI_DEF_H */
+#endif /* MPLAYER_TVI_DEF_H */
diff --git a/stream/tvi_dshow.h b/stream/tvi_dshow.h
index d5047ef361..bc347e5930 100644
--- a/stream/tvi_dshow.h
+++ b/stream/tvi_dshow.h
@@ -1,5 +1,5 @@
-#ifndef TVI_DSHOW_H_
-#define TVI_DSHOW_H_
+#ifndef MPLAYER_TVI_DSHOW_H
+#define MPLAYER_TVI_DSHOW_H
/// \defgroup tvi_dshow TV driver (Directshow)
@@ -690,4 +690,4 @@ DECLARE_ENUMERATOR_(IEnumMediaTypes, AM_MEDIA_TYPE *);
#define OLE_RELEASE_SAFE(p) if(p){ OLE_CALL((IUnknown*)p,Release); p=NULL;}
#define OLE_QUERYINTERFACE(p,iface,ptr) OLE_CALL_ARGS((IUnknown*)p,QueryInterface,&iface,(void*)&ptr)
-#endif // TVI_DSHOW_H_
+#endif /* MPLAYER_TVI_DSHOW_H */
diff --git a/stream/udp.h b/stream/udp.h
index 75de24703d..6af6f6817d 100644
--- a/stream/udp.h
+++ b/stream/udp.h
@@ -17,9 +17,9 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef UDP_H
-#define UDP_H
+#ifndef MPLAYER_UDP_H
+#define MPLAYER_UDP_H
int udp_open_socket (URL_t *url);
-#endif /* UDP_H */
+#endif /* MPLAYER_UDP_H */
diff --git a/stream/url.h b/stream/url.h
index 4711dbeb4e..1f13bee1d7 100644
--- a/stream/url.h
+++ b/stream/url.h
@@ -4,8 +4,8 @@
* (C) 2001, MPlayer team.
*/
-#ifndef URL_H
-#define URL_H
+#ifndef MPLAYER_URL_H
+#define MPLAYER_URL_H
//#define URL_DEBUG
@@ -30,4 +30,4 @@ void url_escape_string(char *outbuf, const char *inbuf);
void url_debug(const URL_t* url);
#endif /* URL_DEBUG */
-#endif /* URL_H */
+#endif /* MPLAYER_URL_H */
diff --git a/stream/vcd_read.h b/stream/vcd_read.h
index b7bb379b7d..cf876d98e4 100644
--- a/stream/vcd_read.h
+++ b/stream/vcd_read.h
@@ -1,5 +1,5 @@
-#ifndef VCD_READ_H
-#define VCD_READ_H
+#ifndef MPLAYER_VCD_READ_H
+#define MPLAYER_VCD_READ_H
#include "libavutil/intreadwrite.h"
//=================== VideoCD ==========================
@@ -225,4 +225,4 @@ static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset)
#endif
-#endif /* VCD_READ_H */
+#endif /* MPLAYER_VCD_READ_H */
diff --git a/stream/vcd_read_darwin.h b/stream/vcd_read_darwin.h
index 85076d46cd..ca9eed4f62 100644
--- a/stream/vcd_read_darwin.h
+++ b/stream/vcd_read_darwin.h
@@ -1,5 +1,5 @@
-#ifndef VCD_READ_DARWIN_H
-#define VCD_READ_DARWIN_H
+#ifndef MPLAYER_VCD_READ_DARWIN_H
+#define MPLAYER_VCD_READ_DARWIN_H
#include <sys/types.h>
#include <CoreFoundation/CFBase.h>
@@ -203,4 +203,4 @@ static int vcd_read(mp_vcd_priv_t* vcd,char *mem)
return VCD_SECTOR_DATA;
}
-#endif /* VCD_READ_DARWIN_H */
+#endif /* MPLAYER_VCD_READ_DARWIN_H */
diff --git a/stream/vcd_read_fbsd.h b/stream/vcd_read_fbsd.h
index 3b061b9121..da9477a7cb 100644
--- a/stream/vcd_read_fbsd.h
+++ b/stream/vcd_read_fbsd.h
@@ -1,5 +1,5 @@
-#ifndef VCD_READ_FBSD_H
-#define VCD_READ_FBSD_H
+#ifndef MPLAYER_VCD_READ_FBSD_H
+#define MPLAYER_VCD_READ_FBSD_H
#include <sys/types.h>
#include <inttypes.h>
@@ -233,4 +233,4 @@ vcd_read(mp_vcd_priv_t* vcd, char *mem)
return VCD_SECTOR_DATA;
}
-#endif /* VCD_READ_FBSD_H */
+#endif /* MPLAYER_VCD_READ_FBSD_H */
diff --git a/stream/vcd_read_win32.h b/stream/vcd_read_win32.h
index 6a2f17f87c..86bfbf4fa4 100644
--- a/stream/vcd_read_win32.h
+++ b/stream/vcd_read_win32.h
@@ -1,5 +1,5 @@
-#ifndef VCD_READ_WIN32_H
-#define VCD_READ_WIN32_H
+#ifndef MPLAYER_VCD_READ_WIN32_H
+#define MPLAYER_VCD_READ_WIN32_H
#include <ddk/ntddcdrm.h>
@@ -130,7 +130,7 @@ static int vcd_read(mp_vcd_priv_t* vcd, char *mem)
return VCD_SECTOR_DATA;
}
-#endif /* VCD_READ_WIN32_H */
+#endif /* MPLAYER_VCD_READ_WIN32_H */
/*
vim:noet:sw=4:cino=\:0,g0
diff --git a/sub_cc.h b/sub_cc.h
index e02ecf98e2..344fbbab77 100644
--- a/sub_cc.h
+++ b/sub_cc.h
@@ -1,10 +1,10 @@
-#ifndef SUB_CC_H
-#define SUB_CC_H
+#ifndef MPLAYER_SUB_CC_H
+#define MPLAYER_SUB_CC_H
extern int subcc_enabled;
void subcc_init(void);
void subcc_process_data(unsigned char *inputdata,unsigned int len);
-#endif /* SUB_CC_H */
+#endif /* MPLAYER_SUB_CC_H */
diff --git a/subopt-helper.h b/subopt-helper.h
index f9d17a0715..cd435d455b 100644
--- a/subopt-helper.h
+++ b/subopt-helper.h
@@ -1,5 +1,5 @@
-#ifndef SUBOPT_HELPER_H
-#define SUBOPT_HELPER_H
+#ifndef MPLAYER_SUBOPT_HELPER_H
+#define MPLAYER_SUBOPT_HELPER_H
/**
* \file subopt-helper.h
@@ -47,4 +47,4 @@ int int_pos( int * i );
int strargcmp(strarg_t *arg, const char *str);
int strargcasecmp(strarg_t *arg, char *str);
-#endif /* SUBOPT_HELPER_H */
+#endif /* MPLAYER_SUBOPT_HELPER_H */
diff --git a/unrar_exec.h b/unrar_exec.h
index 403ef63efe..dfe9e56191 100644
--- a/unrar_exec.h
+++ b/unrar_exec.h
@@ -21,8 +21,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef UNRAR_EXEC_H
-#define UNRAR_EXEC_H
+#ifndef MPLAYER_UNRAR_EXEC_H
+#define MPLAYER_UNRAR_EXEC_H
struct RAR_archive_entry
{
@@ -51,4 +51,4 @@ int unrar_exec_list(const char *rarfile, ArchiveList_struct **list);
void unrar_exec_freelist(ArchiveList_struct *list);
-#endif /* UNRAR_EXEC_H */
+#endif /* MPLAYER_UNRAR_EXEC_H */
diff --git a/xvid_vbr.h b/xvid_vbr.h
index 552d9935bf..8243f88614 100644
--- a/xvid_vbr.h
+++ b/xvid_vbr.h
@@ -23,8 +23,8 @@
*
*****************************************************************************/
-#ifndef XVID_VBR_H
-#define XVID_VBR_H
+#ifndef MPLAYER_XVID_VBR_H
+#define MPLAYER_XVID_VBR_H
#define VBR_VERSION 0
@@ -228,4 +228,4 @@ extern int vbrUpdate(vbr_control_t *state,
int ublocks);
extern int vbrFinish(vbr_control_t *state);
-#endif /* XVID_VBR_H */
+#endif /* MPLAYER_XVID_VBR_H */
diff --git a/xvmc_render.h b/xvmc_render.h
index f43a9c8d67..7efd978600 100644
--- a/xvmc_render.h
+++ b/xvmc_render.h
@@ -1,5 +1,5 @@
-#ifndef XVMC_RENDER_H
-#define XVMC_RENDER_H
+#ifndef MPLAYER_XVMC_RENDER_H
+#define MPLAYER_XVMC_RENDER_H
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -52,4 +52,4 @@ typedef struct{
} xvmc_render_state_t;
-#endif /* XVMC_RENDER_H */
+#endif /* MPLAYER_XVMC_RENDER_H */