Mercurial > mplayer.hg

changeset 25535:3baf6a2283da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add explanatory comments to the #endif part of multiple inclusion guards.
author diego
date Mon, 31 Dec 2007 16:15:50 +0000
parents ed0cfc9e60cb
children a7eec00ebb9c
files drivers/generic_math.h gui/app.h gui/cfg.h gui/interface.h gui/mplayer/common.h gui/mplayer/gmplayer.h gui/mplayer/gtk/about.h gui/mplayer/gtk/common.h gui/mplayer/gtk/eq.h gui/mplayer/gtk/fs.h gui/mplayer/gtk/mb.h gui/mplayer/gtk/menu.h gui/mplayer/gtk/opts.h gui/mplayer/gtk/pl.h gui/mplayer/gtk/sb.h gui/mplayer/gtk/url.h gui/mplayer/play.h gui/mplayer/widgets.h gui/skin/cut.h gui/skin/font.h gui/skin/skin.h gui/win32/dialogs.h gui/win32/gui.h gui/win32/playlist.h gui/win32/skinload.h gui/win32/wincfg.h gui/wm/ws.h gui/wm/wskeys.h gui/wm/wsxdnd.h libaf/dsp.h libaf/filter.h libaf/window.h libao2/audio_out.h libass/ass.h libass/ass_bitmap.h libass/ass_cache.h libass/ass_font.h libass/ass_fontconfig.h libass/ass_library.h libass/ass_mp.h libass/ass_types.h libass/ass_utils.h libass/mputils.h libmpcodecs/ae.h libmpcodecs/ae_faac.h libmpcodecs/ae_lame.h libmpcodecs/ae_lavc.h libmpcodecs/ae_pcm.h libmpcodecs/ae_toolame.h libmpcodecs/ae_twolame.h libmpcodecs/cmmx.h libmpcodecs/img_format.h libmpcodecs/mp_image.h libmpcodecs/mpc_info.h libmpcodecs/vqf.h libmpdemux/asf.h libmpdemux/demux_rtp.h libmpdemux/demux_rtp_internal.h libmpdemux/demux_xmms_plugin.h libmpdemux/mf.h libmpdemux/ms_hdr.h libmpdemux/qtpalette.h libmpdemux/stheader.h libvo/aspect.h libvo/fastmemcpy.h libvo/gl_common.h libvo/gtf.h libvo/osd.h libvo/sub.h libvo/vesa_lvo.h libvo/video_out.h libvo/vosub_vidix.h libvo/wskeys.h libvo/x11_common.h loader/dmo/dmo_guids.h loader/ext.h loader/wine/objbase.h playtree.h playtreeparser.h spudec.h stream/cache2.h stream/cookies.h stream/dvbin.h stream/freesdp/errorlist.c stream/librtsp/rtsp.h stream/librtsp/rtsp_session.h stream/network.h stream/realrtsp/asmrp.h stream/realrtsp/real.h stream/realrtsp/rmff.h stream/realrtsp/sdpplin.h stream/realrtsp/xbuffer.h stream/rtp.h stream/stream_dvdnav.h sub_cc.h subopt-helper.h subreader.h vidix/dha.h vidix/dhahelperwin/dhahelper.h vidix/fourcc.h vidix/vidix.h vidix/vidixlib.h xvid_vbr.h
diffstat 103 files changed, 107 insertions(+), 122 deletions(-) [+]
line wrap: on
line diff
--- a/drivers/generic_math.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/drivers/generic_math.h	Mon Dec 31 16:15:50 2007 +0000
@@ -255,4 +255,4 @@
 #undef cos
 #define cos(x) gen_cos(x)
 
-#endif
\ No newline at end of file
+#endif /* GENERIC_MATH_H */
--- a/gui/app.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/app.h	Mon Dec 31 16:15:50 2007 +0000
@@ -184,4 +184,4 @@
 extern float btnGetValue( int event );
 extern void btnSet( int event,int set );
 
-#endif
+#endif /* GUI_APP_H */
--- a/gui/cfg.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/cfg.h	Mon Dec 31 16:15:50 2007 +0000
@@ -69,4 +69,4 @@
 extern int cfg_read( void );
 extern int cfg_write( void );
 
-#endif
+#endif /* GUI_CFG_H */
--- a/gui/interface.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/interface.h	Mon Dec 31 16:15:50 2007 +0000
@@ -223,4 +223,4 @@
   sprintf( s,"%s/%s",d,n );                     \
  }
 
-#endif
+#endif /* GUI_INTERFACE_H */
--- a/gui/mplayer/common.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/common.h	Mon Dec 31 16:15:50 2007 +0000
@@ -18,4 +18,4 @@
 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
+#endif /* GUI_COMMON_H */
--- a/gui/mplayer/gmplayer.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gmplayer.h	Mon Dec 31 16:15:50 2007 +0000
@@ -31,4 +31,4 @@
 extern void mplPBInit( void );
 extern void mplPBShow( int x, int y );
 
-#endif
+#endif /* GUI_GMPLAYER_H */
--- a/gui/mplayer/gtk/about.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/about.h	Mon Dec 31 16:15:50 2007 +0000
@@ -9,4 +9,4 @@
 extern GtkWidget * create_About( void );
 extern void ShowAboutBox( void );
 
-#endif
+#endif /* GUI_ABOUT_H */
--- a/gui/mplayer/gtk/common.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/common.h	Mon Dec 31 16:15:50 2007 +0000
@@ -21,4 +21,4 @@
 extern GtkWidget * AddComboBox( GtkWidget * parent );
 extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer );
 
-#endif
+#endif /* GUI_COMMON_H */
--- a/gui/mplayer/gtk/eq.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/eq.h	Mon Dec 31 16:15:50 2007 +0000
@@ -9,4 +9,4 @@
 extern GtkWidget * create_Equalizer( void );
 extern void ShowEqualizer( void );
 
-#endif
+#endif /* GUI_EQ_H */
--- a/gui/mplayer/gtk/fs.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/fs.h	Mon Dec 31 16:15:50 2007 +0000
@@ -18,4 +18,4 @@
 
 extern GtkWidget * create_FileSelect( void );
 
-#endif
+#endif /* GUI_FS_H */
--- a/gui/mplayer/gtk/mb.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/mb.h	Mon Dec 31 16:15:50 2007 +0000
@@ -9,4 +9,4 @@
 extern GtkWidget * create_MessageBox( int type );
 extern void ShowMessageBox( const char * msg );
 
-#endif
+#endif /* GUI_MB_H */
--- a/gui/mplayer/gtk/menu.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/menu.h	Mon Dec 31 16:15:50 2007 +0000
@@ -10,4 +10,4 @@
 extern GtkWidget * AddSeparator( GtkWidget * Menu );
 extern GtkWidget * create_PopUpMenu( void );
 
-#endif
+#endif /* GUI_MENU_H */
--- a/gui/mplayer/gtk/opts.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/opts.h	Mon Dec 31 16:15:50 2007 +0000
@@ -13,4 +13,4 @@
 
 extern void ShowPreferences( void );
 
-#endif
+#endif /* GUI_OPTS_H */
--- a/gui/mplayer/gtk/pl.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/pl.h	Mon Dec 31 16:15:50 2007 +0000
@@ -9,4 +9,4 @@
 
 extern GtkWidget * create_PlayList (void);
 
-#endif
+#endif /* GUI_PL_H */
--- a/gui/mplayer/gtk/sb.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/sb.h	Mon Dec 31 16:15:50 2007 +0000
@@ -9,4 +9,4 @@
 extern void ShowSkinBrowser( void );
 extern GtkWidget * create_SkinBrowser( void );
 
-#endif
+#endif /* GUI_SB_H */
--- a/gui/mplayer/gtk/url.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/gtk/url.h	Mon Dec 31 16:15:50 2007 +0000
@@ -8,4 +8,4 @@
 extern void ShowURLDialogBox( void );
 extern GtkWidget * create_URL( void );
 
-#endif
+#endif /* GUI_URL_H */
--- a/gui/mplayer/play.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/play.h	Mon Dec 31 16:15:50 2007 +0000
@@ -31,4 +31,4 @@
 
 extern void mplSetFileName( char * dir,char * name,int type );
 
-#endif
+#endif /* GUI_PLAY_H */
--- a/gui/mplayer/widgets.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/mplayer/widgets.h	Mon Dec 31 16:15:50 2007 +0000
@@ -60,4 +60,4 @@
 extern void gtkSetLayer( GtkWidget * wdg );
 extern void gtkActive( GtkWidget * wdg );
 
-#endif
+#endif /* GUI_WIDGETS_H */
--- a/gui/skin/cut.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/skin/cut.h	Mon Dec 31 16:15:50 2007 +0000
@@ -7,4 +7,4 @@
 extern float cutItemToFloat( char * in,char sep,int num );
 extern void  cutChunk( char * in,char * s1 );
 
-#endif
+#endif /* GUI_CUT_H */
--- a/gui/skin/font.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/skin/font.h	Mon Dec 31 16:15:50 2007 +0000
@@ -34,5 +34,4 @@
 extern int        fntRead( char * path,char * fname );
 extern txSample * fntRender( wItem * item,int px,const char * fmt,... );
 
-#endif
-
+#endif /* GUI_FONT_H */
--- a/gui/skin/skin.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/skin/skin.h	Mon Dec 31 16:15:50 2007 +0000
@@ -15,4 +15,4 @@
 extern char * strswap( char * in,char what,char whereof );
 extern char * trim( char * in );
 
-#endif
+#endif /* GUI_SKIN_H */
--- a/gui/win32/dialogs.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/win32/dialogs.h	Mon Dec 31 16:15:50 2007 +0000
@@ -131,4 +131,4 @@
 #define GTK_MB_WARNING       0x4
 #define GTK_MB_SIMPLE        0x8
 
-#endif
+#endif /* GUI_DIALOGS_H */
--- a/gui/win32/gui.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/win32/gui.h	Mon Dec 31 16:15:50 2007 +0000
@@ -117,4 +117,4 @@
 extern void display_prefswindow(gui_t *gui);
 extern void display_opensubtitlewindow(gui_t *gui);
 
-#endif
+#endif /* GUI_GUI_H */
--- a/gui/win32/playlist.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/win32/playlist.h	Mon Dec 31 16:15:50 2007 +0000
@@ -56,4 +56,4 @@
 extern playlist_t *create_playlist(void);
 extern BOOL adddirtoplaylist(playlist_t *playlist, const char* path, BOOL recursive);
 
-#endif
+#endif /* GUI_PLAYLIST_H */
--- a/gui/win32/skinload.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/win32/skinload.h	Mon Dec 31 16:15:50 2007 +0000
@@ -212,4 +212,4 @@
 #define evShowWindow      7004
 #define evFirstLoad       7005
 
-#endif
+#endif /* GUI_SKINLOAD_H */
--- a/gui/win32/wincfg.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/win32/wincfg.h	Mon Dec 31 16:15:50 2007 +0000
@@ -37,4 +37,4 @@
 extern int cfg_read(void);
 extern int cfg_write(void);
 
-#endif
+#endif /* GUI_WINCFG_H */
--- a/gui/wm/ws.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/wm/ws.h	Mon Dec 31 16:15:50 2007 +0000
@@ -257,5 +257,4 @@
 
 #define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( (X) > (tX) )&&( (Y) > (tY) )&&( (X) < (bX) )&&( (Y) < (bY) ) )
 
-#endif
-
+#endif /* GUI_WS_H */
--- a/gui/wm/wskeys.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/wm/wskeys.h	Mon Dec 31 16:15:50 2007 +0000
@@ -161,5 +161,4 @@
 
 extern const TwsKeyNames wsKeyNames[ wsKeyNumber ];
 
-#endif
-
+#endif /* GUI_WSKEYS_H */
--- a/gui/wm/wsxdnd.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/gui/wm/wsxdnd.h	Mon Dec 31 16:15:50 2007 +0000
@@ -50,4 +50,4 @@
 /* XdndFinished */
 #define XDND_FINISHED_TARGET_WIN(e)	((e)->xclient.data.l[0])
 
-#endif
+#endif /* GUI_WSXDND_H */
--- a/libaf/dsp.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libaf/dsp.h	Mon Dec 31 16:15:50 2007 +0000
@@ -19,4 +19,4 @@
 #include <window.h>
 #include <filter.h>
 
-#endif
+#endif /* DSP_H */
--- a/libaf/filter.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libaf/filter.h	Mon Dec 31 16:15:50 2007 +0000
@@ -66,4 +66,4 @@
   xq[xi]=(xq)[(xi)+(n)]=*(in);\
   xi=(++(xi))&((n)-1);
 
-#endif
+#endif /* FILTER_H */
--- a/libaf/window.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libaf/window.h	Mon Dec 31 16:15:50 2007 +0000
@@ -30,4 +30,4 @@
 extern void af_window_flattop(int n,_ftype_t* w);
 extern void af_window_kaiser(int n, _ftype_t* w,_ftype_t b);
 
-#endif
+#endif /* WINDOW_H */
--- a/libao2/audio_out.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libao2/audio_out.h	Mon Dec 31 16:15:50 2007 +0000
@@ -72,4 +72,4 @@
 	float right;
 } ao_control_vol_t;
 
-#endif
+#endif /* AUDIO_OUT_H */
--- a/libass/ass.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass.h	Mon Dec 31 16:15:50 2007 +0000
@@ -205,5 +205,4 @@
  */
 long long ass_step_sub(ass_track_t* track, long long now, int movement);
 
-#endif
-
+#endif /* ASS_H */
--- a/libass/ass_bitmap.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass_bitmap.h	Mon Dec 31 16:15:50 2007 +0000
@@ -45,5 +45,4 @@
 
 void ass_free_bitmap(bitmap_t* bm);
 
-#endif
-
+#endif /* ASS_BITMAP_H */
--- a/libass/ass_cache.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass_cache.h	Mon Dec 31 16:15:50 2007 +0000
@@ -94,5 +94,4 @@
 void* hashmap_insert(hashmap_t* map, void* key, void* value);
 void* hashmap_find(hashmap_t* map, void* key);
 
-#endif
-
+#endif /* ASS_CACHE_H */
--- a/libass/ass_font.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass_font.h	Mon Dec 31 16:15:50 2007 +0000
@@ -48,4 +48,4 @@
 FT_Vector ass_font_get_kerning(ass_font_t* font, uint32_t c1, uint32_t c2);
 void ass_font_free(ass_font_t* font);
 
-#endif
+#endif /* ASS_FONT_H */
--- a/libass/ass_fontconfig.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass_fontconfig.h	Mon Dec 31 16:15:50 2007 +0000
@@ -31,5 +31,4 @@
 char* fontconfig_select(fc_instance_t* priv, const char* family, unsigned bold, unsigned italic, int* index, uint32_t code);
 void fontconfig_done(fc_instance_t* priv);
 
-#endif
-
+#endif /* ASS_FONTCONFIG_H */
--- a/libass/ass_library.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass_library.h	Mon Dec 31 16:15:50 2007 +0000
@@ -36,5 +36,4 @@
 	int num_fontdata;
 };
 
-#endif
-
+#endif /* ASS_LIBRARY_H */
--- a/libass/ass_mp.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass_mp.h	Mon Dec 31 16:15:50 2007 +0000
@@ -50,5 +50,4 @@
 	int changed;
 } mp_eosd_images_t;
 
-#endif
-
+#endif /* ASS_MP_H */
--- a/libass/ass_types.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass_types.h	Mon Dec 31 16:15:50 2007 +0000
@@ -110,5 +110,4 @@
 	parser_priv_t* parser_priv;
 } ass_track_t;
 
-#endif
-
+#endif /* ASS_TYPES_H */
--- a/libass/ass_utils.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/ass_utils.h	Mon Dec 31 16:15:50 2007 +0000
@@ -57,5 +57,4 @@
 	return (int)(x * 0x10000);
 }
 
-#endif
-
+#endif /* ASS_UTILS_H */
--- a/libass/mputils.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libass/mputils.h	Mon Dec 31 16:15:50 2007 +0000
@@ -8,4 +8,4 @@
 #include "libvo/sub.h" // for utf8_get_char
 #include "libavutil/common.h"
 
-#endif
+#endif /* ASS_MPUTILS_H */
--- a/libmpcodecs/ae.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/ae.h	Mon Dec 31 16:15:50 2007 +0000
@@ -43,4 +43,4 @@
 
 audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params);
 
-#endif
+#endif /* MPAE_H */
--- a/libmpcodecs/ae_faac.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/ae_faac.h	Mon Dec 31 16:15:50 2007 +0000
@@ -5,4 +5,4 @@
 
 int mpae_init_faac(audio_encoder_t *encoder);
 
-#endif
+#endif /* MPAE_FAAC_H */
--- a/libmpcodecs/ae_lame.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/ae_lame.h	Mon Dec 31 16:15:50 2007 +0000
@@ -5,4 +5,4 @@
 
 int mpae_init_lame(audio_encoder_t *encoder);
 
-#endif
+#endif /* AE_LAME_H */
--- a/libmpcodecs/ae_lavc.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/ae_lavc.h	Mon Dec 31 16:15:50 2007 +0000
@@ -5,4 +5,4 @@
 
 int mpae_init_lavc(audio_encoder_t *encoder);
 
-#endif
+#endif /* AE_LAVC_H */
--- a/libmpcodecs/ae_pcm.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/ae_pcm.h	Mon Dec 31 16:15:50 2007 +0000
@@ -5,4 +5,4 @@
 
 int mpae_init_pcm(audio_encoder_t *encoder);
 
-#endif
+#endif /* AE_PCM_H */
--- a/libmpcodecs/ae_toolame.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/ae_toolame.h	Mon Dec 31 16:15:50 2007 +0000
@@ -13,4 +13,4 @@
 
 int mpae_init_toolame(audio_encoder_t *encoder);
 
-#endif
+#endif /* MPAE_TOOLAME_H */
--- a/libmpcodecs/ae_twolame.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/ae_twolame.h	Mon Dec 31 16:15:50 2007 +0000
@@ -11,4 +11,4 @@
 
 int mpae_init_twolame(audio_encoder_t *encoder);
 
-#endif
+#endif /* MPAE_TWOLAME_H */
--- a/libmpcodecs/cmmx.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/cmmx.h	Mon Dec 31 16:15:50 2007 +0000
@@ -183,4 +183,4 @@
     return pcmpzb(a ^ b);
 }
 
-#endif
+#endif /* CMMX_H */
--- a/libmpcodecs/img_format.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/img_format.h	Mon Dec 31 16:15:50 2007 +0000
@@ -117,4 +117,4 @@
 
 const char *vo_format_name(int format);
 
-#endif
+#endif /* IMG_FORMAT_H */
--- a/libmpcodecs/mp_image.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/mp_image.h	Mon Dec 31 16:15:50 2007 +0000
@@ -228,4 +228,4 @@
 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
+#endif /* MP_IMAGE_H */
--- a/libmpcodecs/mpc_info.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/mpc_info.h	Mon Dec 31 16:15:50 2007 +0000
@@ -22,4 +22,4 @@
 #define CONTROL_ERROR -2
 #define CONTROL_NA -3
 
-#endif
+#endif /* MP_CODEC_INFO_T */
--- a/libmpcodecs/vqf.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpcodecs/vqf.h	Mon Dec 31 16:15:50 2007 +0000
@@ -223,4 +223,4 @@
 #endif
 
 
-#endif
+#endif /* tvqdec_h */
--- a/libmpdemux/asf.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpdemux/asf.h	Mon Dec 31 16:15:50 2007 +0000
@@ -244,4 +244,4 @@
     unsigned bps;
 };
 
-#endif
+#endif /* ASF_H */
--- a/libmpdemux/demux_rtp.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpdemux/demux_rtp.h	Mon Dec 31 16:15:50 2007 +0000
@@ -28,4 +28,4 @@
 // Close a RTP demuxer
 void demux_close_rtp(demuxer_t* demuxer);
 
-#endif
+#endif /* DEMUX_RTP_H */
--- a/libmpdemux/demux_rtp_internal.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpdemux/demux_rtp_internal.h	Mon Dec 31 16:15:50 2007 +0000
@@ -41,4 +41,4 @@
     // "streamType": 0 => video; 1 => audio
     // This routine returns False if the input stream has closed
 
-#endif
+#endif /* DEMUX_RTP_INTERNAL_H */
--- a/libmpdemux/demux_xmms_plugin.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpdemux/demux_xmms_plugin.h	Mon Dec 31 16:15:50 2007 +0000
@@ -152,4 +152,4 @@
 	void (*render_freq)(short freq_data[2][256]); /* Render the freq data, don't do anything time consuming in here */
 } VisPlugin;
 
-#endif
+#endif /* PLUGIN_H */
--- a/libmpdemux/mf.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpdemux/mf.h	Mon Dec 31 16:15:50 2007 +0000
@@ -16,4 +16,4 @@
 
 mf_t* open_mf(char * filename);
 
-#endif
+#endif /* MF_H */
--- a/libmpdemux/ms_hdr.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpdemux/ms_hdr.h	Mon Dec 31 16:15:50 2007 +0000
@@ -79,4 +79,4 @@
 #endif
 #endif
 
-#endif
+#endif /* MS_HDR_H */
--- a/libmpdemux/qtpalette.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpdemux/qtpalette.h	Mon Dec 31 16:15:50 2007 +0000
@@ -568,4 +568,4 @@
   /* 255, 0xFF */  0x00, 0x00, 0x00, 0x00
 };
 
-#endif
+#endif /* QTPALETTE_H */
--- a/libmpdemux/stheader.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libmpdemux/stheader.h	Mon Dec 31 16:15:50 2007 +0000
@@ -119,4 +119,4 @@
 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
+#endif /* STHEADER_H */
--- a/libvo/aspect.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/aspect.h	Mon Dec 31 16:15:50 2007 +0000
@@ -20,5 +20,4 @@
 
 void aspect(int *srcw, int *srch, int zoom);
 
-#endif
-
+#endif /* ASPECT_H */
--- a/libvo/fastmemcpy.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/fastmemcpy.h	Mon Dec 31 16:15:50 2007 +0000
@@ -105,4 +105,4 @@
 	return retval;
 }
 
-#endif
+#endif /* FASTMEMCPY_H */
--- a/libvo/gl_common.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/gl_common.h	Mon Dec 31 16:15:50 2007 +0000
@@ -328,4 +328,4 @@
 extern void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei,
                              GLsizei, GLint, GLenum, GLenum, const GLvoid *);
 
-#endif
+#endif /* GL_COMMON_H */
--- a/libvo/gtf.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/gtf.h	Mon Dec 31 16:15:50 2007 +0000
@@ -45,4 +45,4 @@
 void GTF_calcTimings(double X,double Y,double freq, int type,
                      int want_margins, int want_interlace,struct VesaCRTCInfoBlock *result);
 
-#endif
+#endif /* GTF_H */
--- a/libvo/osd.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/osd.h	Mon Dec 31 16:15:50 2007 +0000
@@ -15,5 +15,4 @@
 extern void vo_draw_alpha_rgb15(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
 extern void vo_draw_alpha_rgb16(int w,int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase,int dststride);
 
-#endif
-
+#endif /* MPLAYER_OSD_H */
--- a/libvo/sub.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/sub.h	Mon Dec 31 16:15:50 2007 +0000
@@ -139,4 +139,5 @@
 #endif
 
 #endif
-#endif
+
+#endif /* MPLAYER_SUB_H */
--- a/libvo/vesa_lvo.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/vesa_lvo.h	Mon Dec 31 16:15:50 2007 +0000
@@ -24,4 +24,4 @@
 void     vlvo_flip_page(void);
 void     vlvo_draw_osd(void);
 
-#endif
+#endif /* VESA_LVO_H */
--- a/libvo/video_out.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/video_out.h	Mon Dec 31 16:15:50 2007 +0000
@@ -254,5 +254,5 @@
 extern char *monitor_dotclock_str;
 
 #endif 
-		
-#endif
+
+#endif /* VIDEO_OUT_H */
--- a/libvo/vosub_vidix.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/vosub_vidix.h	Mon Dec 31 16:15:50 2007 +0000
@@ -35,4 +35,4 @@
 int vidix_grkey_get(vidix_grkey_t *gr_key);
 int vidix_grkey_set(const vidix_grkey_t *gr_key);
 
-#endif
+#endif /* VOSUB_VIDIX_H */
--- a/libvo/wskeys.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/wskeys.h	Mon Dec 31 16:15:50 2007 +0000
@@ -152,5 +152,4 @@
 #define wsGrayInsert    0x9e + 256
 #define wsGrayDelete    0x9f + 256
 
-#endif
-
+#endif /* WSKEYS_H */
--- a/libvo/x11_common.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/libvo/x11_common.h	Mon Dec 31 16:15:50 2007 +0000
@@ -125,5 +125,4 @@
 
 int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return);
 
-#endif
-
+#endif /* X11_COMMON_H */
--- a/loader/dmo/dmo_guids.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/loader/dmo/dmo_guids.h	Mon Dec 31 16:15:50 2007 +0000
@@ -32,4 +32,4 @@
 extern const GUID DMOCATEGORY_AGC;
 */
 
-#endif
+#endif /* DMO_GUIDS_H */
--- a/loader/ext.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/loader/ext.h	Mon Dec 31 16:15:50 2007 +0000
@@ -17,4 +17,4 @@
 extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n);
 extern int __vprintf( const char *format, ... );
 
-#endif
+#endif /* loader_ext_h */
--- a/loader/wine/objbase.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/loader/wine/objbase.h	Mon Dec 31 16:15:50 2007 +0000
@@ -16,4 +16,5 @@
 HRESULT STDCALL CoInitialize(LPVOID pvReserved);
 HRESULT STDCALL CoInitializeEx(LPVOID pvReserved, DWORD dwCoinit);
 void STDCALL CoUninitialize(void);
-#endif
+
+#endif /* WINE_OBJBASE_H */
--- a/playtree.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/playtree.h	Mon Dec 31 16:15:50 2007 +0000
@@ -282,6 +282,6 @@
 
 ///@}
 
-#endif
+#endif /* PLAYTREE_H */
 
 ///@}
--- a/playtreeparser.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/playtreeparser.h	Mon Dec 31 16:15:50 2007 +0000
@@ -47,6 +47,6 @@
 void
 play_tree_add_bpf(play_tree_t* pt, char* filename);
 
-#endif
+#endif /* PLAYTREEPARSER_H */
 
 ///@}
--- a/spudec.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/spudec.h	Mon Dec 31 16:15:50 2007 +0000
@@ -19,5 +19,5 @@
 int spudec_changed(void *this);
 void spudec_calc_bbox(void *me, unsigned int dxs, unsigned int dys, unsigned int* bbox);
 void spudec_set_forced_subs_only(void * const this, const unsigned int flag);
-#endif
 
+#endif /* MPLAYER_SPUDEC_H */
--- a/stream/cache2.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/cache2.h	Mon Dec 31 16:15:50 2007 +0000
@@ -3,4 +3,4 @@
 
 extern void cache_uninit(stream_t *s);
 
-#endif
+#endif /* CACHE2_H */
--- a/stream/cookies.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/cookies.h	Mon Dec 31 16:15:50 2007 +0000
@@ -13,4 +13,4 @@
 extern void cookies_set(HTTP_header_t * http_hdr, const char *hostname,
 			const char *url);
 
-#endif
+#endif /* COOKIES_H */
--- a/stream/dvbin.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/dvbin.h	Mon Dec 31 16:15:50 2007 +0000
@@ -113,4 +113,4 @@
 extern dvb_config_t *dvb_get_config(void);
 extern void dvb_free_config(dvb_config_t *config);
 
-#endif
+#endif /* DVBIN_H */
--- a/stream/freesdp/errorlist.c	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/freesdp/errorlist.c	Mon Dec 31 16:15:50 2007 +0000
@@ -69,4 +69,4 @@
   return (fsdp_error_t_s[err_no]);
 }
 
-#endif
+#endif /* FSDP_ERRORLIST_C */
--- a/stream/librtsp/rtsp.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/librtsp/rtsp.h	Mon Dec 31 16:15:50 2007 +0000
@@ -80,5 +80,4 @@
 void rtsp_unschedule_field(rtsp_t *s, const char *string);
 void rtsp_unschedule_all(rtsp_t *s);
 
-#endif
-
+#endif /* HAVE_RTSP_H */
--- a/stream/librtsp/rtsp_session.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/librtsp/rtsp_session.h	Mon Dec 31 16:15:50 2007 +0000
@@ -40,4 +40,4 @@
 
 void rtsp_session_end(rtsp_session_t *session);
 
-#endif
+#endif /* HAVE_RTSP_SESSION_H */
--- a/stream/network.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/network.h	Mon Dec 31 16:15:50 2007 +0000
@@ -63,4 +63,4 @@
 int http_authenticate(HTTP_header_t *http_hdr, URL_t *url, int *auth_retry);
 URL_t* check4proxies(URL_t *url);
 
-#endif
+#endif /* NETWORK_H */
--- a/stream/realrtsp/asmrp.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/realrtsp/asmrp.h	Mon Dec 31 16:15:50 2007 +0000
@@ -44,4 +44,4 @@
 
 int asmrp_match (const char *rules, int bandwidth, int *matches) ;
 
-#endif
+#endif /* HAVE_ASMRP_H */
--- a/stream/realrtsp/real.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/realrtsp/real.h	Mon Dec 31 16:15:50 2007 +0000
@@ -57,5 +57,4 @@
 struct real_rtsp_session_t *init_real_rtsp_session (void);
 void free_real_rtsp_session (struct real_rtsp_session_t* real_session);
 
-#endif
-
+#endif /* HAVE_REAL_H */
--- a/stream/realrtsp/rmff.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/realrtsp/rmff.h	Mon Dec 31 16:15:50 2007 +0000
@@ -273,4 +273,4 @@
  */
 void rmff_free_header(rmff_header_t *h);
 
-#endif
+#endif /* HAVE_RMFF_H */
--- a/stream/realrtsp/sdpplin.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/realrtsp/sdpplin.h	Mon Dec 31 16:15:50 2007 +0000
@@ -105,5 +105,4 @@
 
 void sdpplin_free(sdpplin_t *description);
 
-#endif
-
+#endif /* HAVE_SDPPLIN_H */
--- a/stream/realrtsp/xbuffer.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/realrtsp/xbuffer.h	Mon Dec 31 16:15:50 2007 +0000
@@ -23,4 +23,4 @@
 void *xbuffer_ensure_size(void *buf, int size);
 void *xbuffer_strcat(void *buf, char *data);
 
-#endif
+#endif /* XCL_H */
--- a/stream/rtp.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/rtp.h	Mon Dec 31 16:15:50 2007 +0000
@@ -10,4 +10,4 @@
 
 int read_rtp_from_server(int fd, char *buffer, int length);
 
-#endif
+#endif /* RTP_H */
--- a/stream/stream_dvdnav.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/stream/stream_dvdnav.h	Mon Dec 31 16:15:50 2007 +0000
@@ -35,4 +35,4 @@
 void mp_dvdnav_get_highlight (stream_t *stream, nav_highlight_t *hl);
 unsigned int *mp_dvdnav_get_spu_clut(stream_t *stream);
 
-#endif
+#endif /* MPLAYER_STREAM_DVDNAV_H */
--- a/sub_cc.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/sub_cc.h	Mon Dec 31 16:15:50 2007 +0000
@@ -6,5 +6,5 @@
 void subcc_init(void);
 void subcc_process_data(unsigned char *inputdata,unsigned int len);
 
-#endif /*SUB_CC_H*/
+#endif /* SUB_CC_H */
 
--- a/subopt-helper.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/subopt-helper.h	Mon Dec 31 16:15:50 2007 +0000
@@ -47,4 +47,4 @@
 int strargcmp(strarg_t *arg, const char *str);
 int strargcasecmp(strarg_t *arg, char *str);
 
-#endif
+#endif /* SUBOPT_HELPER_H */
--- a/subreader.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/subreader.h	Mon Dec 31 16:15:50 2007 +0000
@@ -89,4 +89,5 @@
 void step_sub(sub_data *subd, float pts, int movement);
 void sub_add_text(subtitle *sub, const char *txt, int len, double endpts);
 int sub_clear_text(subtitle *sub, double pts);
-#endif
+
+#endif /* MPLAYER_SUBREADER_H */
--- a/vidix/dha.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/vidix/dha.h	Mon Dec 31 16:15:50 2007 +0000
@@ -92,4 +92,4 @@
 }
 #endif
 
-#endif
+#endif /* LIBDHA_H */
--- a/vidix/dhahelperwin/dhahelper.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/vidix/dhahelperwin/dhahelper.h	Mon Dec 31 16:15:50 2007 +0000
@@ -68,4 +68,4 @@
 
 typedef struct dhahelper_t dhahelper_t;
 
-#endif
+#endif /* _DHAHELPER_H */
--- a/vidix/fourcc.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/vidix/fourcc.h	Mon Dec 31 16:15:50 2007 +0000
@@ -79,4 +79,4 @@
 /*  Vendor-specific formats   */
 #define IMGFMT_WNVA    vid_fourcc('W','N','V','A') /* Winnov hw compress */
 
-#endif
+#endif /* FOURCC_H */
--- a/vidix/vidix.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/vidix/vidix.h	Mon Dec 31 16:15:50 2007 +0000
@@ -314,4 +314,4 @@
 }
 #endif
 
-#endif
+#endif /* VIDIX_H */
--- a/vidix/vidixlib.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/vidix/vidixlib.h	Mon Dec 31 16:15:50 2007 +0000
@@ -141,4 +141,4 @@
 }
 #endif
 
-#endif
+#endif /* VIDIXLIB_H */
--- a/xvid_vbr.h	Mon Dec 31 16:14:38 2007 +0000
+++ b/xvid_vbr.h	Mon Dec 31 16:15:50 2007 +0000
@@ -228,4 +228,4 @@
 		     int ublocks);
 extern int vbrFinish(vbr_control_t *state);
 
-#endif
+#endif /* XVID_VBR_H */