Add MPLAYER_ prefix to multiple inclusion guards.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26061 b3059339-0415-0410-9bf9-f77b7e298cf2

access_mpcontext.h

@@ -1,5 +1,5 @@
-#ifndef ACCESS_MPCONTEXT_H
+#ifndef MPLAYER_ACCESS_MPCONTEXT_H
-#define 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 */

asxparser.h

@@ -1,5 +1,5 @@
-#ifndef ASXPARSER_H
+#ifndef MPLAYER_ASXPARSER_H
-#define 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 */

cfg-mencoder.h

@@ -1,5 +1,5 @@
-#ifndef CFG_MENCODER_H
+#ifndef MPLAYER_CFG_MENCODER_H
-#define 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 */

cfg-mplayer.h

@@ -1,5 +1,5 @@
-#ifndef CFG_MPLAYER_H
+#ifndef MPLAYER_CFG_MPLAYER_H
-#define 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 */
 

codec-cfg.h

@@ -1,5 +1,5 @@
-#ifndef CODEC_CFG_H
+#ifndef MPLAYER_CODEC_CFG_H
-#define 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 */

command.h

@@ -1,8 +1,8 @@
-#ifndef COMMAND_H
+#ifndef MPLAYER_COMMAND_H
-#define 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 */

cpudetect.h

@@ -1,5 +1,5 @@
-#ifndef CPUDETECT_H
+#ifndef MPLAYER_CPUDETECT_H
-#define 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 */

cputable.h

@@ -4,8 +4,8 @@
  * Family F codenames owe much thanks to Neil Phillips, author of x86test.
  */
 
-#ifndef CPUTABLE_H
+#ifndef MPLAYER_CPUTABLE_H
-#define 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 */

drivers/generic_math.h

@@ -19,8 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef GENERIC_MATH_H
+#ifndef MPLAYER_GENERIC_MATH_H
-#define 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 */

drivers/mga_vid.h

@@ -21,8 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef MGA_VID_H
+#ifndef MPLAYER_MGA_VID_H
-#define 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 */

drivers/radeon.h

@@ -20,8 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef	RADEON_H
+#ifndef	MPLAYER_RADEON_H
-#define	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 */

drivers/radeon_vid.h

@@ -22,8 +22,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef RADEON_VID_H
+#ifndef MPLAYER_RADEON_VID_H
-#define 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 */

drivers/tdfx_vid.h

@@ -18,8 +18,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef TDFX_VID_H
+#ifndef MPLAYER_TDFX_VID_H
-#define 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 */

edl.h

@@ -1,7 +1,7 @@
 // EDL version 0.6
 
-#ifndef EDL_H
+#ifndef MPLAYER_EDL_H
-#define 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 */

fmt-conversion.h

@@ -1,5 +1,5 @@
-#ifndef FMT_CONVERSION_H
+#ifndef MPLAYER_FMT_CONVERSION_H
-#define 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 */

get_path.h

@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GET_PATH_H
+#ifndef MPLAYER_GET_PATH_H
-#define 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 */

gui/app.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_APP_H
-#ifndef GUI_APP_H
+#define MPLAYER_GUI_APP_H
-#define 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 */

gui/bitmap.h

@@ -1,5 +1,5 @@
-#ifndef GUI_BITMAP_H
+#ifndef MPLAYER_GUI_BITMAP_H
-#define 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 */

gui/cfg.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_CFG_H
-#ifndef GUI_CFG_H
+#define MPLAYER_GUI_CFG_H
-#define 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 */

gui/interface.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_INTERFACE_H
-#ifndef GUI_INTERFACE_H
+#define MPLAYER_GUI_INTERFACE_H
-#define 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 */

gui/mplayer/gmplayer.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_GMPLAYER_H
-#ifndef GUI_GMPLAYER_H
+#define MPLAYER_GUI_GMPLAYER_H
-#define 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 */

gui/mplayer/gtk/about.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_ABOUT_H
-#ifndef GUI_ABOUT_H
+#define MPLAYER_GUI_ABOUT_H
-#define 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 */

gui/mplayer/gtk/eq.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_EQ_H
-#ifndef GUI_EQ_H
+#define MPLAYER_GUI_EQ_H
-#define 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 */

gui/mplayer/gtk/fs.h

@@ -1,5 +1,5 @@
-#ifndef GUI_FS_H
+#ifndef MPLAYER_GUI_FS_H
-#define 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 */

gui/mplayer/gtk/gtk_common.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_GTK_COMMON_H
-#ifndef GUI_GTK_COMMON_H
+#define MPLAYER_GUI_GTK_COMMON_H
-#define 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 */

gui/mplayer/gtk/mb.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_MB_H
-#ifndef GUI_MB_H
+#define MPLAYER_GUI_MB_H
-#define 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 */

gui/mplayer/gtk/menu.h

@@ -1,5 +1,5 @@
-#ifndef GUI_MENU_H
+#ifndef MPLAYER_GUI_MENU_H
-#define 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 */

gui/mplayer/gtk/opts.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_OPTS_H
-#ifndef GUI_OPTS_H
+#define MPLAYER_GUI_OPTS_H
-#define 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 */

gui/mplayer/gtk/pl.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_PL_H
-#ifndef GUI_PL_H
+#define MPLAYER_GUI_PL_H
-#define 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 */

gui/mplayer/gtk/sb.h

@@ -1,5 +1,5 @@
-#ifndef GUI_SB_H
+#ifndef MPLAYER_GUI_SB_H
-#define 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 */

gui/mplayer/gtk/url.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_URL_H
-#ifndef GUI_URL_H
+#define MPLAYER_GUI_URL_H
-#define 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 */

gui/mplayer/gui_common.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_GUI_COMMON_H
-#ifndef GUI_GUI_COMMON_H
+#define MPLAYER_GUI_GUI_COMMON_H
-#define 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 */

gui/mplayer/play.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_PLAY_H
-#ifndef GUI_PLAY_H
+#define MPLAYER_GUI_PLAY_H
-#define 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 */

gui/mplayer/widgets.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_WIDGETS_H
-#ifndef GUI_WIDGETS_H
+#define MPLAYER_GUI_WIDGETS_H
-#define 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 */

gui/skin/cut.h

@@ -1,10 +1,9 @@
-
+#ifndef MPLAYER_GUI_CUT_H
-#ifndef GUI_CUT_H
+#define MPLAYER_GUI_CUT_H
-#define 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 */

gui/skin/font.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_FONT_H
-#ifndef GUI_FONT_H
+#define MPLAYER_GUI_FONT_H
-#define 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 */

gui/skin/skin.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_SKIN_H
-#ifndef GUI_SKIN_H
+#define MPLAYER_GUI_SKIN_H
-#define 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 */

gui/win32/dialogs.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GUI_DIALOGS_H
+#ifndef MPLAYER_GUI_DIALOGS_H
-#define 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 */

gui/win32/gui.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GUI_GUI_H
+#ifndef MPLAYER_GUI_GUI_H
-#define 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 */

gui/win32/playlist.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GUI_PLAYLIST_H
+#ifndef MPLAYER_GUI_PLAYLIST_H
-#define 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 */

gui/win32/skinload.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GUI_SKINLOAD_H
+#ifndef MPLAYER_GUI_SKINLOAD_H
-#define 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 */

gui/win32/wincfg.h

@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GUI_WINCFG_H
+#ifndef MPLAYER_GUI_WINCFG_H
-#define 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 */

gui/wm/ws.h

@@ -4,8 +4,8 @@
 //   Writed by pontscho / fresh!mindworkz
 // ----------------------------------------------------------------------------------------------
 
-#ifndef GUI_WS_H
+#ifndef MPLAYER_GUI_WS_H
-#define 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 */

gui/wm/wskeys.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_WSKEYS_H
-#ifndef GUI_WSKEYS_H
+#define MPLAYER_GUI_WSKEYS_H
-#define 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 */

gui/wm/wsmkeys.h

@@ -1,5 +1,5 @@
-#ifndef GUI_WSMKEYS_H
+#ifndef MPLAYER_GUI_WSMKEYS_H
-#define 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 */

gui/wm/wsxdnd.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_GUI_WSXDND_H
-#ifndef GUI_WSXDND_H
+#define MPLAYER_GUI_WSXDND_H
-#define 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 */

input/ar.h

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef INPUT_AR_H
+#ifndef MPLAYER_AR_H
-#define INPUT_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 */

input/input.h

@@ -1,5 +1,5 @@
-#ifndef INPUT_H
+#ifndef MPLAYER_INPUT_H
-#define 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 */

input/joystick.h

@@ -1,5 +1,5 @@
-#ifndef JOYSTICK_H
+#ifndef MPLAYER_JOYSTICK_H
-#define 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 */

input/lirc.h

@@ -1,5 +1,5 @@
-#ifndef LIRC_H
+#ifndef MPLAYER_LIRC_H
-#define 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 */

input/mouse.h

@@ -1,5 +1,5 @@
-#ifndef MOUSE_H
+#ifndef MPLAYER_MOUSE_H
-#define 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 */

libaf/af.h

@@ -1,5 +1,5 @@
-#ifndef AF_H
+#ifndef MPLAYER_AF_H
-#define 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 */

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 */

libaf/af_hrtf.h

@@ -1,5 +1,5 @@
-#ifndef AF_HRTF_H
+#ifndef MPLAYER_AF_HRTF_H
-#define 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 */

libaf/af_mp.h

@@ -1,6 +1,6 @@
 /* Include file for mplayer specific defines and includes */
-#ifndef AF_MP_H
+#ifndef MPLAYER_AF_MP_H
-#define 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 */

libaf/control.h

@@ -1,5 +1,5 @@
-#ifndef AF_CONTROL_H
+#ifndef MPLAYER_CONTROL_H
-#define AF_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 */

libaf/dsp.h

@@ -8,8 +8,8 @@
 //=============================================================================
 */
 
-#ifndef	DSP_H
+#ifndef	MPLAYER_DSP_H
-#define	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 */

libaf/equalizer.h

@@ -8,8 +8,8 @@
 //=============================================================================
 */
 
-#ifndef EQUALIZER_H
+#ifndef MPLAYER_EQUALIZER_H
-#define 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 */

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
+#ifndef MPLAYER_FILTER_H
-#define 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 */

libaf/reorder_ch.h

@@ -20,8 +20,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef REORDER_CH_H
+#ifndef MPLAYER_REORDER_CH_H
-#define 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 */

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
+#ifndef MPLAYER_WINDOW_H
-#define 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 */

libao2/audio_out.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_AUDIO_OUT_H
-#ifndef AUDIO_OUT_H
+#define MPLAYER_AUDIO_OUT_H
-#define 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 */

libao2/audio_out_internal.h

@@ -1,5 +1,5 @@
-#ifndef AUDIO_OUT_INTERNAL_H
+#ifndef MPLAYER_AUDIO_OUT_INTERNAL_H
-#define 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 */

libmenu/menu.h

@@ -1,5 +1,5 @@
-#ifndef MENU_H
+#ifndef MPLAYER_MENU_H
-#define 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 */

libmenu/menu_list.h

@@ -1,5 +1,5 @@
-#ifndef MENU_LIST_H
+#ifndef MPLAYER_MENU_LIST_H
-#define 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 */

libmpcodecs/ad.h

@@ -1,5 +1,5 @@
-#ifndef AD_H
+#ifndef MPLAYER_AD_H
-#define 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 */

libmpcodecs/ad_internal.h

@@ -1,5 +1,5 @@
-#ifndef AD_INTERNAL_H
+#ifndef MPLAYER_AD_INTERNAL_H
-#define 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 */

libmpcodecs/ae.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_AE_H
-#ifndef AE_H
+#define MPLAYER_AE_H
-#define 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 */

libmpcodecs/ae_faac.h

@@ -1,8 +1,8 @@
-#ifndef AE_FAAC_H
+#ifndef MPLAYER_AE_FAAC_H
-#define 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 */

libmpcodecs/ae_lame.h

@@ -1,8 +1,8 @@
-#ifndef AE_LAME_H
+#ifndef MPLAYER_AE_LAME_H
-#define 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 */

libmpcodecs/ae_lavc.h

@@ -1,8 +1,8 @@
-#ifndef AE_LAVC_H
+#ifndef MPLAYER_AE_LAVC_H
-#define 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 */

libmpcodecs/ae_pcm.h

@@ -1,8 +1,8 @@
-#ifndef AE_PCM_H
+#ifndef MPLAYER_AE_PCM_H
-#define 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 */

libmpcodecs/ae_toolame.h

@@ -1,5 +1,5 @@
-#ifndef AE_TOOLAME_H
+#ifndef MPLAYER_AE_TOOLAME_H
-#define 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 */

libmpcodecs/ae_twolame.h

@@ -1,5 +1,5 @@
-#ifndef AE_TWOLAME_H
+#ifndef MPLAYER_AE_TWOLAME_H
-#define 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 */

libmpcodecs/cmmx.h

@@ -4,8 +4,8 @@
  * Author: Zoltan Hidvegi
  */
 
-#ifndef CMMX_H
+#ifndef MPLAYER_CMMX_H
-#define 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 */

libmpcodecs/dec_audio.h

@@ -1,5 +1,5 @@
-#ifndef DEC_AUDIO_H
+#ifndef MPLAYER_DEC_AUDIO_H
-#define 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 */

libmpcodecs/dec_video.h

@@ -1,5 +1,5 @@
-#ifndef DEC_VIDEO_H
+#ifndef MPLAYER_DEC_VIDEO_H
-#define 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 */

libmpcodecs/img_format.h

@@ -1,6 +1,5 @@
-
+#ifndef MPLAYER_IMG_FORMAT_H
-#ifndef IMG_FORMAT_H
+#define MPLAYER_IMG_FORMAT_H
-#define 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 */

libmpcodecs/mp_image.h

@@ -1,5 +1,5 @@
-#ifndef MP_IMAGE_H
+#ifndef MPLAYER_MP_IMAGE_H
-#define 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 */

libmpcodecs/mpc_info.h

@@ -1,5 +1,5 @@
-#ifndef MPC_INFO_H
+#ifndef MPLAYER_MPC_INFO_H
-#define 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 */

libmpcodecs/native/alaw.h

@@ -1,7 +1,7 @@
 // Generated by TOOLS/alaw-gen.c
 
-#ifndef ALAW_H
+#ifndef MPLAYER_ALAW_H
-#define 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 */

libmpcodecs/native/mmx.h

@@ -1,5 +1,5 @@
-#ifndef MMX_H
+#ifndef MPLAYER_MMX_H
-#define 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 */

libmpcodecs/native/xa_gsm.h

@@ -1,8 +1,8 @@
-#ifndef XA_GSM_H
+#ifndef MPLAYER_XA_GSM_H
-#define 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 */

libmpcodecs/native/xa_gsm_int.h

@@ -22,8 +22,8 @@
  *
  ********************************************************************/
 
-#ifndef XA_GSM_INT_H
+#ifndef MPLAYER_XA_GSM_INT_H
-#define 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 */

libmpcodecs/pullup.h

@@ -1,5 +1,5 @@
-#ifndef PULLUP_H
+#ifndef MPLAYER_PULLUP_H
-#define 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 */

libmpcodecs/vd.h

@@ -1,5 +1,5 @@
-#ifndef VD_H
+#ifndef MPLAYER_VD_H
-#define 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 */

libmpcodecs/vd_internal.h

@@ -1,5 +1,5 @@
-#ifndef VD_INTERNAL_H
+#ifndef MPLAYER_VD_INTERNAL_H
-#define 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 */

libmpcodecs/vf.h

@@ -1,5 +1,5 @@
-#ifndef VF_H
+#ifndef MPLAYER_VF_H
-#define 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 */

libmpcodecs/vf_scale.h

@@ -1,9 +1,9 @@
 //GPL
 
-#ifndef VF_SCALE_H
+#ifndef MPLAYER_VF_SCALE_H
-#define 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 */

libmpcodecs/vfcap.h

@@ -1,7 +1,7 @@
 // VFCAP_* values: they are flags, returned by query_format():
 
-#ifndef VFCAP_H
+#ifndef MPLAYER_VFCAP_H
-#define 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 */

libmpcodecs/vqf.h

@@ -5,8 +5,8 @@
 
 // Modified for MPlayer on 2004.12.29
 
-#ifndef VQF_H
+#ifndef MPLAYER_VQF_H
-#define 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 */

libmpdemux/asf.h

@@ -1,5 +1,5 @@
-#ifndef ASF_H
+#ifndef MPLAYER_ASF_H
-#define 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 */

libmpdemux/aviheader.h

@@ -1,5 +1,5 @@
-#ifndef AVIHEADER_H
+#ifndef MPLAYER_AVIHEADER_H
-#define 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 */

libmpdemux/demux_avs.h

@@ -21,8 +21,8 @@
  * Boston, MA 02110-1301 USA.
  */
 
-#ifndef DEMUX_AVS_H
+#ifndef MPLAYER_DEMUX_AVS_H
-#define 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 */

libmpdemux/demux_rtp.h

@@ -1,5 +1,5 @@
-#ifndef DEMUX_RTP_H
+#ifndef MPLAYER_DEMUX_RTP_H
-#define 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 */

libmpdemux/demux_rtp_internal.h

@@ -1,5 +1,5 @@
-#ifndef DEMUX_RTP_INTERNAL_H
+#ifndef MPLAYER_DEMUX_RTP_INTERNAL_H
-#define 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 */

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
+#ifndef MPLAYER_DEMUX_XMMS_PLUGIN_H
-#define 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 */

libmpdemux/demuxer.h

@@ -1,5 +1,5 @@
-#ifndef DEMUXER_H
+#ifndef MPLAYER_DEMUXER_H
-#define 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 */

libmpdemux/ebml.h

@@ -1,5 +1,5 @@
-#ifndef EBML_H
+#ifndef MPLAYER_EBML_H
-#define 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 */

libmpdemux/genres.h

@@ -13,9 +13,8 @@
  * detailed changelog at http://svn.mplayerhq.hu/mplayer/trunk/
  */
 
-
+#ifndef MPLAYER_GENRES_H
-#ifndef GENRES_H
+#define MPLAYER_GENRES_H
-#define GENRES_H
 
 
 const char * const genres[] = {
@@ -277,5 +276,4 @@ const char * const genres[] = {
 "Unknown",					/* 255 */
 };
 
-
+#endif /* MPLAYER_GENRES_H */
-#endif /* GENRES_H */