diff options
103 files changed, 107 insertions, 122 deletions
diff --git a/drivers/generic_math.h b/drivers/generic_math.h index 459cf2a276..b5638eb02d 100644 --- a/drivers/generic_math.h +++ b/drivers/generic_math.h @@ -255,4 +255,4 @@ static double inline gen_cos(double x) #undef cos #define cos(x) gen_cos(x) -#endif
\ No newline at end of file +#endif /* GENERIC_MATH_H */ @@ -184,4 +184,4 @@ extern void btnModify( int event,float state ); extern float btnGetValue( int event ); extern void btnSet( int event,int set ); -#endif +#endif /* GUI_APP_H */ @@ -69,4 +69,4 @@ extern gtkASS_t gtkASS; extern int cfg_read( void ); extern int cfg_write( void ); -#endif +#endif /* GUI_CFG_H */ diff --git a/gui/interface.h b/gui/interface.h index ed2f788092..ad073a7333 100644 --- a/gui/interface.h +++ b/gui/interface.h @@ -223,4 +223,4 @@ extern char * gstrchr( char * str,int c ); sprintf( s,"%s/%s",d,n ); \ } -#endif +#endif /* GUI_INTERFACE_H */ diff --git a/gui/mplayer/common.h b/gui/mplayer/common.h index 0f015805f0..661ead64c3 100644 --- a/gui/mplayer/common.h +++ b/gui/mplayer/common.h @@ -18,4 +18,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 +#endif /* GUI_COMMON_H */ diff --git a/gui/mplayer/gmplayer.h b/gui/mplayer/gmplayer.h index 367aa474c1..e0d9c9b6a0 100644 --- a/gui/mplayer/gmplayer.h +++ b/gui/mplayer/gmplayer.h @@ -31,4 +31,4 @@ extern void mplMenuMouseHandle( int X,int Y,int RX,int RY ); extern void mplPBInit( void ); extern void mplPBShow( int x, int y ); -#endif +#endif /* GUI_GMPLAYER_H */ diff --git a/gui/mplayer/gtk/about.h b/gui/mplayer/gtk/about.h index 0fc2495a7c..9b8337c53e 100644 --- a/gui/mplayer/gtk/about.h +++ b/gui/mplayer/gtk/about.h @@ -9,4 +9,4 @@ extern GtkWidget * About; extern GtkWidget * create_About( void ); extern void ShowAboutBox( void ); -#endif +#endif /* GUI_ABOUT_H */ diff --git a/gui/mplayer/gtk/common.h b/gui/mplayer/gtk/common.h index d8df6234cb..f96b9d2bb5 100644 --- a/gui/mplayer/gtk/common.h +++ b/gui/mplayer/gtk/common.h @@ -21,4 +21,4 @@ extern GtkWidget * AddVScaler( GtkAdjustment * adj,GtkWidget * parent,int digit extern GtkWidget * AddComboBox( GtkWidget * parent ); extern void WidgetDestroy( GtkWidget * widget,GtkWidget ** widget_pointer ); -#endif +#endif /* GUI_COMMON_H */ diff --git a/gui/mplayer/gtk/eq.h b/gui/mplayer/gtk/eq.h index 599cd3a3a0..093bce8092 100644 --- a/gui/mplayer/gtk/eq.h +++ b/gui/mplayer/gtk/eq.h @@ -9,4 +9,4 @@ extern GtkWidget * Equalizer; extern GtkWidget * create_Equalizer( void ); extern void ShowEqualizer( void ); -#endif +#endif /* GUI_EQ_H */ diff --git a/gui/mplayer/gtk/fs.h b/gui/mplayer/gtk/fs.h index 078a52e44b..31e9a54d5d 100644 --- a/gui/mplayer/gtk/fs.h +++ b/gui/mplayer/gtk/fs.h @@ -18,4 +18,4 @@ extern void ShowFileSelect( int type, int modal ); extern GtkWidget * create_FileSelect( void ); -#endif +#endif /* GUI_FS_H */ diff --git a/gui/mplayer/gtk/mb.h b/gui/mplayer/gtk/mb.h index 2bd7cd97e0..f77dfb35ae 100644 --- a/gui/mplayer/gtk/mb.h +++ b/gui/mplayer/gtk/mb.h @@ -9,4 +9,4 @@ extern GtkWidget * MessageBox; extern GtkWidget * create_MessageBox( int type ); extern void ShowMessageBox( const char * msg ); -#endif +#endif /* GUI_MB_H */ diff --git a/gui/mplayer/gtk/menu.h b/gui/mplayer/gtk/menu.h index b81cdd2df8..8e272ba0df 100644 --- a/gui/mplayer/gtk/menu.h +++ b/gui/mplayer/gtk/menu.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 +#endif /* GUI_MENU_H */ diff --git a/gui/mplayer/gtk/opts.h b/gui/mplayer/gtk/opts.h index 3ef572e2c8..93ace3af3f 100644 --- a/gui/mplayer/gtk/opts.h +++ b/gui/mplayer/gtk/opts.h @@ -13,4 +13,4 @@ extern GtkWidget * create_AudioConfig( void ); extern void ShowPreferences( void ); -#endif +#endif /* GUI_OPTS_H */ diff --git a/gui/mplayer/gtk/pl.h b/gui/mplayer/gtk/pl.h index 5e80983ad1..5d6780c0b8 100644 --- a/gui/mplayer/gtk/pl.h +++ b/gui/mplayer/gtk/pl.h @@ -9,4 +9,4 @@ extern void HidePlayList( void ); extern GtkWidget * create_PlayList (void); -#endif +#endif /* GUI_PL_H */ diff --git a/gui/mplayer/gtk/sb.h b/gui/mplayer/gtk/sb.h index 13286c103a..a1a7e3775d 100644 --- a/gui/mplayer/gtk/sb.h +++ b/gui/mplayer/gtk/sb.h @@ -9,4 +9,4 @@ extern GtkWidget * SkinBrowser; extern void ShowSkinBrowser( void ); extern GtkWidget * create_SkinBrowser( void ); -#endif +#endif /* GUI_SB_H */ diff --git a/gui/mplayer/gtk/url.h b/gui/mplayer/gtk/url.h index 4746cdc484..93d37a20db 100644 --- a/gui/mplayer/gtk/url.h +++ b/gui/mplayer/gtk/url.h @@ -8,4 +8,4 @@ extern int gtkVURLDialogBox; extern void ShowURLDialogBox( void ); extern GtkWidget * create_URL( void ); -#endif +#endif /* GUI_URL_H */ diff --git a/gui/mplayer/play.h b/gui/mplayer/play.h index 4cb158021f..2e545bc3e3 100644 --- a/gui/mplayer/play.h +++ b/gui/mplayer/play.h @@ -31,4 +31,4 @@ extern void EventHandling( void ); extern void mplSetFileName( char * dir,char * name,int type ); -#endif +#endif /* GUI_PLAY_H */ diff --git a/gui/mplayer/widgets.h b/gui/mplayer/widgets.h index dfa7bd5048..255737c74f 100644 --- a/gui/mplayer/widgets.h +++ b/gui/mplayer/widgets.h @@ -60,4 +60,4 @@ extern void gtkMessageBox( int type,const gchar * str ); extern void gtkSetLayer( GtkWidget * wdg ); extern void gtkActive( GtkWidget * wdg ); -#endif +#endif /* GUI_WIDGETS_H */ diff --git a/gui/skin/cut.h b/gui/skin/cut.h index f351f66311..66ac10abef 100644 --- a/gui/skin/cut.h +++ b/gui/skin/cut.h @@ -7,4 +7,4 @@ 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 +#endif /* GUI_CUT_H */ diff --git a/gui/skin/font.h b/gui/skin/font.h index 0990f64953..1392febb5a 100644 --- a/gui/skin/font.h +++ b/gui/skin/font.h @@ -34,5 +34,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 - +#endif /* GUI_FONT_H */ diff --git a/gui/skin/skin.h b/gui/skin/skin.h index 87693d2e51..a1540ecd07 100644 --- a/gui/skin/skin.h +++ b/gui/skin/skin.h @@ -15,4 +15,4 @@ extern char * trimleft( char * in ); extern char * strswap( char * in,char what,char whereof ); extern char * trim( char * in ); -#endif +#endif /* GUI_SKIN_H */ diff --git a/gui/win32/dialogs.h b/gui/win32/dialogs.h index 48433d2c1b..d0b52a4965 100644 --- a/gui/win32/dialogs.h +++ b/gui/win32/dialogs.h @@ -131,4 +131,4 @@ #define GTK_MB_WARNING 0x4 #define GTK_MB_SIMPLE 0x8 -#endif +#endif /* GUI_DIALOGS_H */ diff --git a/gui/win32/gui.h b/gui/win32/gui.h index 4c98815caf..3c6c245947 100644 --- a/gui/win32/gui.h +++ b/gui/win32/gui.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 +#endif /* GUI_GUI_H */ diff --git a/gui/win32/playlist.h b/gui/win32/playlist.h index 09d10a3bb4..38698e78c1 100644 --- a/gui/win32/playlist.h +++ b/gui/win32/playlist.h @@ -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 +#endif /* GUI_PLAYLIST_H */ diff --git a/gui/win32/skinload.h b/gui/win32/skinload.h index 33b59ef996..69885f36df 100644 --- a/gui/win32/skinload.h +++ b/gui/win32/skinload.h @@ -212,4 +212,4 @@ extern skin_t *loadskin(char *skindir, int desktopbpp); #define evShowWindow 7004 #define evFirstLoad 7005 -#endif +#endif /* GUI_SKINLOAD_H */ diff --git a/gui/win32/wincfg.h b/gui/win32/wincfg.h index 6d00c2ac8a..f55b368aa5 100644 --- a/gui/win32/wincfg.h +++ b/gui/win32/wincfg.h @@ -37,4 +37,4 @@ extern int gui_sub_pos_y; extern int cfg_read(void); extern int cfg_write(void); -#endif +#endif /* GUI_WINCFG_H */ diff --git a/gui/wm/ws.h b/gui/wm/ws.h index 9c6a566ea5..90b18894b7 100644 --- a/gui/wm/ws.h +++ b/gui/wm/ws.h @@ -257,5 +257,4 @@ extern void wsScreenSaverOff( Display * mDisplay ); #define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( (X) > (tX) )&&( (Y) > (tY) )&&( (X) < (bX) )&&( (Y) < (bY) ) ) -#endif - +#endif /* GUI_WS_H */ diff --git a/gui/wm/wskeys.h b/gui/wm/wskeys.h index ab6ad750f9..3b7eadc20b 100644 --- a/gui/wm/wskeys.h +++ b/gui/wm/wskeys.h @@ -161,5 +161,4 @@ typedef struct extern const TwsKeyNames wsKeyNames[ wsKeyNumber ]; -#endif - +#endif /* GUI_WSKEYS_H */ diff --git a/gui/wm/wsxdnd.h b/gui/wm/wsxdnd.h index d44ce82dd3..4694d82733 100644 --- a/gui/wm/wsxdnd.h +++ b/gui/wm/wsxdnd.h @@ -50,4 +50,4 @@ void wsXDNDClearAwareness(wsTWindow* window); /* XdndFinished */ #define XDND_FINISHED_TARGET_WIN(e) ((e)->xclient.data.l[0]) -#endif +#endif /* GUI_WSXDND_H */ diff --git a/libaf/dsp.h b/libaf/dsp.h index f476ff3d2d..2acf8dac0d 100644 --- a/libaf/dsp.h +++ b/libaf/dsp.h @@ -19,4 +19,4 @@ #include <window.h> #include <filter.h> -#endif +#endif /* DSP_H */ diff --git a/libaf/filter.h b/libaf/filter.h index ad5798a94a..92ff229910 100644 --- a/libaf/filter.h +++ b/libaf/filter.h @@ -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 +#endif /* FILTER_H */ diff --git a/libaf/window.h b/libaf/window.h index 03a0dccab7..6e18414ba3 100644 --- a/libaf/window.h +++ b/libaf/window.h @@ -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 +#endif /* WINDOW_H */ diff --git a/libao2/audio_out.h b/libao2/audio_out.h index ef10dc6c95..0909264248 100644 --- a/libao2/audio_out.h +++ b/libao2/audio_out.h @@ -72,4 +72,4 @@ typedef struct ao_control_vol_s { float right; } ao_control_vol_t; -#endif +#endif /* AUDIO_OUT_H */ diff --git a/libass/ass.h b/libass/ass.h index 353c4abc59..b87054489f 100644 --- a/libass/ass.h +++ b/libass/ass.h @@ -205,5 +205,4 @@ void ass_add_font(ass_library_t* library, char* name, char* data, int data_size) */ long long ass_step_sub(ass_track_t* track, long long now, int movement); -#endif - +#endif /* ASS_H */ diff --git a/libass/ass_bitmap.h b/libass/ass_bitmap.h index 3394ab2d52..7e47875b6d 100644 --- a/libass/ass_bitmap.h +++ b/libass/ass_bitmap.h @@ -45,5 +45,4 @@ int glyph_to_bitmap(ass_synth_priv_t* priv, FT_Glyph glyph, FT_Glyph outline_gly void ass_free_bitmap(bitmap_t* bm); -#endif - +#endif /* ASS_BITMAP_H */ diff --git a/libass/ass_cache.h b/libass/ass_cache.h index c601caf6c0..cc5af4bd08 100644 --- a/libass/ass_cache.h +++ b/libass/ass_cache.h @@ -94,5 +94,4 @@ void hashmap_done(hashmap_t* map); void* hashmap_insert(hashmap_t* map, void* key, void* value); void* hashmap_find(hashmap_t* map, void* key); -#endif - +#endif /* ASS_CACHE_H */ diff --git a/libass/ass_font.h b/libass/ass_font.h index 838f626361..60b7746a7d 100644 --- a/libass/ass_font.h +++ b/libass/ass_font.h @@ -48,4 +48,4 @@ FT_Glyph ass_font_get_glyph(void* fontconfig_priv, ass_font_t* font, uint32_t ch 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 */ diff --git a/libass/ass_fontconfig.h b/libass/ass_fontconfig.h index 6acb528d3e..1ae5157e0b 100644 --- a/libass/ass_fontconfig.h +++ b/libass/ass_fontconfig.h @@ -31,5 +31,4 @@ fc_instance_t* fontconfig_init(ass_library_t* library, FT_Library ftlibrary, con 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 */ diff --git a/libass/ass_library.h b/libass/ass_library.h index 4cebe42e43..0adadced8f 100644 --- a/libass/ass_library.h +++ b/libass/ass_library.h @@ -36,5 +36,4 @@ struct ass_library_s { int num_fontdata; }; -#endif - +#endif /* ASS_LIBRARY_H */ diff --git a/libass/ass_mp.h b/libass/ass_mp.h index c5541465ae..1395b45f9d 100644 --- a/libass/ass_mp.h +++ b/libass/ass_mp.h @@ -50,5 +50,4 @@ typedef struct { int changed; } mp_eosd_images_t; -#endif - +#endif /* ASS_MP_H */ diff --git a/libass/ass_types.h b/libass/ass_types.h index e0c71a96a7..577379c810 100644 --- a/libass/ass_types.h +++ b/libass/ass_types.h @@ -110,5 +110,4 @@ typedef struct ass_track_s { parser_priv_t* parser_priv; } ass_track_t; -#endif - +#endif /* ASS_TYPES_H */ diff --git a/libass/ass_utils.h b/libass/ass_utils.h index 5e2adecdfa..be8b3dfa97 100644 --- a/libass/ass_utils.h +++ b/libass/ass_utils.h @@ -57,5 +57,4 @@ static inline int double_to_d16(double x) { return (int)(x * 0x10000); } -#endif - +#endif /* ASS_UTILS_H */ diff --git a/libass/mputils.h b/libass/mputils.h index ef7c8e4fe6..50c52cb0e0 100644 --- a/libass/mputils.h +++ b/libass/mputils.h @@ -8,4 +8,4 @@ #include "libvo/sub.h" // for utf8_get_char #include "libavutil/common.h" -#endif +#endif /* ASS_MPUTILS_H */ diff --git a/libmpcodecs/ae.h b/libmpcodecs/ae.h index 99899e2e23..5e4dbdfaa8 100644 --- a/libmpcodecs/ae.h +++ b/libmpcodecs/ae.h @@ -43,4 +43,4 @@ typedef struct audio_encoder_s { audio_encoder_t *new_audio_encoder(muxer_stream_t *stream, audio_encoding_params_t *params); -#endif +#endif /* MPAE_H */ diff --git a/libmpcodecs/ae_faac.h b/libmpcodecs/ae_faac.h index 95fe502e15..bc0cdff6b6 100644 --- a/libmpcodecs/ae_faac.h +++ b/libmpcodecs/ae_faac.h @@ -5,4 +5,4 @@ int mpae_init_faac(audio_encoder_t *encoder); -#endif +#endif /* MPAE_FAAC_H */ diff --git a/libmpcodecs/ae_lame.h b/libmpcodecs/ae_lame.h index dc4af5d2c2..221e5ffe64 100644 --- a/libmpcodecs/ae_lame.h +++ b/libmpcodecs/ae_lame.h @@ -5,4 +5,4 @@ int mpae_init_lame(audio_encoder_t *encoder); -#endif +#endif /* AE_LAME_H */ diff --git a/libmpcodecs/ae_lavc.h b/libmpcodecs/ae_lavc.h index e7b957fd88..b2000b7583 100644 --- a/libmpcodecs/ae_lavc.h +++ b/libmpcodecs/ae_lavc.h @@ -5,4 +5,4 @@ int mpae_init_lavc(audio_encoder_t *encoder); -#endif +#endif /* AE_LAVC_H */ diff --git a/libmpcodecs/ae_pcm.h b/libmpcodecs/ae_pcm.h index ea6bcde1e3..5eae0631b1 100644 --- a/libmpcodecs/ae_pcm.h +++ b/libmpcodecs/ae_pcm.h @@ -5,4 +5,4 @@ int mpae_init_pcm(audio_encoder_t *encoder); -#endif +#endif /* AE_PCM_H */ diff --git a/libmpcodecs/ae_toolame.h b/libmpcodecs/ae_toolame.h index 30000a05ba..8deabdffe0 100644 --- a/libmpcodecs/ae_toolame.h +++ b/libmpcodecs/ae_toolame.h @@ -13,4 +13,4 @@ typedef struct { int mpae_init_toolame(audio_encoder_t *encoder); -#endif +#endif /* MPAE_TOOLAME_H */ diff --git a/libmpcodecs/ae_twolame.h b/libmpcodecs/ae_twolame.h index 65d3590f9b..08811f7680 100644 --- a/libmpcodecs/ae_twolame.h +++ b/libmpcodecs/ae_twolame.h @@ -11,4 +11,4 @@ typedef struct { int mpae_init_twolame(audio_encoder_t *encoder); -#endif +#endif /* MPAE_TWOLAME_H */ diff --git a/libmpcodecs/cmmx.h b/libmpcodecs/cmmx.h index 8ee1651309..27b3070282 100644 --- a/libmpcodecs/cmmx.h +++ b/libmpcodecs/cmmx.h @@ -183,4 +183,4 @@ pcmpeqb(cmmx_t a, cmmx_t b) return pcmpzb(a ^ b); } -#endif +#endif /* CMMX_H */ diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h index b95a4658f2..5f6040a267 100644 --- a/libmpcodecs/img_format.h +++ b/libmpcodecs/img_format.h @@ -117,4 +117,4 @@ typedef struct { const char *vo_format_name(int format); -#endif +#endif /* IMG_FORMAT_H */ diff --git a/libmpcodecs/mp_image.h b/libmpcodecs/mp_image.h index 3d8433f56d..624a9d66c3 100644 --- a/libmpcodecs/mp_image.h +++ b/libmpcodecs/mp_image.h @@ -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 +#endif /* MP_IMAGE_H */ diff --git a/libmpcodecs/mpc_info.h b/libmpcodecs/mpc_info.h index 97f90b899f..3cb9a2cbd2 100644 --- a/libmpcodecs/mpc_info.h +++ b/libmpcodecs/mpc_info.h @@ -22,4 +22,4 @@ typedef struct mp_codec_info_s #define CONTROL_ERROR -2 #define CONTROL_NA -3 -#endif +#endif /* MP_CODEC_INFO_T */ diff --git a/libmpcodecs/vqf.h b/libmpcodecs/vqf.h index 84bcdc2bc2..54d6ca0850 100644 --- a/libmpcodecs/vqf.h +++ b/libmpcodecs/vqf.h @@ -223,4 +223,4 @@ DllPort int TvqGetFbTotalBits(); // query total number of used bits #endif -#endif +#endif /* tvqdec_h */ diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index 2252953755..6eb6b101e0 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -244,4 +244,4 @@ struct asf_priv { unsigned bps; }; -#endif +#endif /* ASF_H */ diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h index cffd3d9d85..5eba3a680e 100644 --- a/libmpdemux/demux_rtp.h +++ b/libmpdemux/demux_rtp.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 +#endif /* DEMUX_RTP_H */ diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h index 321e9f09e9..ba92e2b33d 100644 --- a/libmpdemux/demux_rtp_internal.h +++ b/libmpdemux/demux_rtp_internal.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 +#endif /* DEMUX_RTP_INTERNAL_H */ diff --git a/libmpdemux/demux_xmms_plugin.h b/libmpdemux/demux_xmms_plugin.h index dd3e7938e5..c2b1b8351c 100644 --- a/libmpdemux/demux_xmms_plugin.h +++ b/libmpdemux/demux_xmms_plugin.h @@ -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 +#endif /* PLUGIN_H */ diff --git a/libmpdemux/mf.h b/libmpdemux/mf.h index 6022ee12b9..f49cac4ed7 100644 --- a/libmpdemux/mf.h +++ b/libmpdemux/mf.h @@ -16,4 +16,4 @@ typedef struct mf_t* open_mf(char * filename); -#endif +#endif /* MF_H */ diff --git a/libmpdemux/ms_hdr.h b/libmpdemux/ms_hdr.h index 4c647e531d..4595f269dd 100644 --- a/libmpdemux/ms_hdr.h +++ b/libmpdemux/ms_hdr.h @@ -79,4 +79,4 @@ typedef struct { #endif #endif -#endif +#endif /* MS_HDR_H */ diff --git a/libmpdemux/qtpalette.h b/libmpdemux/qtpalette.h index 71a2e9686c..7635ccca17 100644 --- a/libmpdemux/qtpalette.h +++ b/libmpdemux/qtpalette.h @@ -568,4 +568,4 @@ static unsigned char qt_default_grayscale_palette_256[256 * 4] = { /* 255, 0xFF */ 0x00, 0x00, 0x00, 0x00 }; -#endif +#endif /* QTPALETTE_H */ diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 5d1473be6a..d560322e04 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -119,4 +119,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 +#endif /* STHEADER_H */ diff --git a/libvo/aspect.h b/libvo/aspect.h index de0a182397..9c4157cb38 100644 --- a/libvo/aspect.h +++ b/libvo/aspect.h @@ -20,5 +20,4 @@ void aspect_save_screenres(int scrw, int scrh); void aspect(int *srcw, int *srch, int zoom); -#endif - +#endif /* ASPECT_H */ diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index a379a6f4bc..e09deb4f5b 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -105,4 +105,4 @@ static inline void * memcpy_pic2(void * dst, const void * src, return retval; } -#endif +#endif /* FASTMEMCPY_H */ diff --git a/libvo/gl_common.h b/libvo/gl_common.h index 1d5ab8dede..a2e7467193 100644 --- a/libvo/gl_common.h +++ b/libvo/gl_common.h @@ -328,4 +328,4 @@ extern int (APIENTRY *SwapInterval)(int); extern void (APIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -#endif +#endif /* GL_COMMON_H */ diff --git a/libvo/gtf.h b/libvo/gtf.h index aa51dc97a0..d898462735 100644 --- a/libvo/gtf.h +++ b/libvo/gtf.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 +#endif /* GTF_H */ diff --git a/libvo/osd.h b/libvo/osd.h index d1a744ad3b..c376d8d49c 100644 --- a/libvo/osd.h +++ b/libvo/osd.h @@ -15,5 +15,4 @@ extern void vo_draw_alpha_rgb32(int w,int h, unsigned char* src, unsigned char * 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 */ diff --git a/libvo/sub.h b/libvo/sub.h index fcfdd71a88..0ca3b5a46b 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -139,4 +139,5 @@ void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey); #endif #endif -#endif + +#endif /* MPLAYER_SUB_H */ diff --git a/libvo/vesa_lvo.h b/libvo/vesa_lvo.h index 81cab0366f..4a4550c417 100644 --- a/libvo/vesa_lvo.h +++ b/libvo/vesa_lvo.h @@ -24,4 +24,4 @@ uint32_t vlvo_draw_frame(uint8_t *src[]); void vlvo_flip_page(void); void vlvo_draw_osd(void); -#endif +#endif /* VESA_LVO_H */ diff --git a/libvo/video_out.h b/libvo/video_out.h index 443654692c..db9a84c495 100644 --- a/libvo/video_out.h +++ b/libvo/video_out.h @@ -254,5 +254,5 @@ extern char *monitor_vfreq_str; extern char *monitor_dotclock_str; #endif - -#endif + +#endif /* VIDEO_OUT_H */ diff --git a/libvo/vosub_vidix.h b/libvo/vosub_vidix.h index 71116cf263..acd0bc45a6 100644 --- a/libvo/vosub_vidix.h +++ b/libvo/vosub_vidix.h @@ -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 +#endif /* VOSUB_VIDIX_H */ diff --git a/libvo/wskeys.h b/libvo/wskeys.h index 65dd06541d..194ce10f0d 100644 --- a/libvo/wskeys.h +++ b/libvo/wskeys.h @@ -152,5 +152,4 @@ #define wsGrayInsert 0x9e + 256 #define wsGrayDelete 0x9f + 256 -#endif - +#endif /* WSKEYS_H */ diff --git a/libvo/x11_common.h b/libvo/x11_common.h index c646e0309e..73fed1f3a6 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -125,5 +125,4 @@ void update_xinerama_info(void); int vo_find_depth_from_visuals(Display *dpy, int screen, Visual **visual_return); -#endif - +#endif /* X11_COMMON_H */ diff --git a/loader/dmo/dmo_guids.h b/loader/dmo/dmo_guids.h index 56dffbe79b..db9cb179aa 100644 --- a/loader/dmo/dmo_guids.h +++ b/loader/dmo/dmo_guids.h @@ -32,4 +32,4 @@ extern const GUID DMOCATEGORY_AUDIO_NOISE_SUPPRESS; extern const GUID DMOCATEGORY_AGC; */ -#endif +#endif /* DMO_GUIDS_H */ diff --git a/loader/ext.h b/loader/ext.h index c53fd5669f..42eb9b2c6a 100644 --- a/loader/ext.h +++ b/loader/ext.h @@ -17,4 +17,4 @@ extern int FILE_munmap( LPVOID start, DWORD size_high, DWORD size_low ); extern int wcsnicmp(const unsigned short* s1, const unsigned short* s2, int n); extern int __vprintf( const char *format, ... ); -#endif +#endif /* loader_ext_h */ diff --git a/loader/wine/objbase.h b/loader/wine/objbase.h index 41ec88247c..784a9999e6 100644 --- a/loader/wine/objbase.h +++ b/loader/wine/objbase.h @@ -16,4 +16,5 @@ typedef enum tagCOINIT { HRESULT STDCALL CoInitialize(LPVOID pvReserved); HRESULT STDCALL CoInitializeEx(LPVOID pvReserved, DWORD dwCoinit); void STDCALL CoUninitialize(void); -#endif + +#endif /* WINE_OBJBASE_H */ diff --git a/playtree.h b/playtree.h index 5efffea535..a5132caf61 100644 --- a/playtree.h +++ b/playtree.h @@ -282,6 +282,6 @@ void pt_iter_goto_head(play_tree_iter_t* iter); ///@} -#endif +#endif /* PLAYTREE_H */ ///@} diff --git a/playtreeparser.h b/playtreeparser.h index 22e299dfc2..94b4461d6c 100644 --- a/playtreeparser.h +++ b/playtreeparser.h @@ -47,6 +47,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 +#endif /* PLAYTREEPARSER_H */ ///@} @@ -19,5 +19,5 @@ void spudec_set_hw_spu(void *this, const vo_functions_t *hw_spu); 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 */ diff --git a/stream/cache2.h b/stream/cache2.h index 645bf5ed47..924202735f 100644 --- a/stream/cache2.h +++ b/stream/cache2.h @@ -3,4 +3,4 @@ extern void cache_uninit(stream_t *s); -#endif +#endif /* CACHE2_H */ diff --git a/stream/cookies.h b/stream/cookies.h index 6cee753463..4f5c4f7511 100644 --- a/stream/cookies.h +++ b/stream/cookies.h @@ -13,4 +13,4 @@ extern void cookies_set(HTTP_header_t * http_hdr, const char *hostname, const char *url); -#endif +#endif /* COOKIES_H */ diff --git a/stream/dvbin.h b/stream/dvbin.h index 6c04d95438..31c4d6b383 100644 --- a/stream/dvbin.h +++ b/stream/dvbin.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 +#endif /* DVBIN_H */ diff --git a/stream/freesdp/errorlist.c b/stream/freesdp/errorlist.c index e934cd6da5..1fb6e93851 100644 --- a/stream/freesdp/errorlist.c +++ b/stream/freesdp/errorlist.c @@ -69,4 +69,4 @@ fsdp_strerror (fsdp_error_t err_no) return (fsdp_error_t_s[err_no]); } -#endif +#endif /* FSDP_ERRORLIST_C */ diff --git a/stream/librtsp/rtsp.h b/stream/librtsp/rtsp.h index eefdd79d51..2c3c32eb6d 100644 --- a/stream/librtsp/rtsp.h +++ b/stream/librtsp/rtsp.h @@ -80,5 +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 - +#endif /* HAVE_RTSP_H */ diff --git a/stream/librtsp/rtsp_session.h b/stream/librtsp/rtsp_session.h index 8503ae2cc7..da2ede77ab 100644 --- a/stream/librtsp/rtsp_session.h +++ b/stream/librtsp/rtsp_session.h @@ -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 +#endif /* HAVE_RTSP_SESSION_H */ diff --git a/stream/network.h b/stream/network.h index 26a9e76878..37ee0e9a4b 100644 --- a/stream/network.h +++ b/stream/network.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 +#endif /* NETWORK_H */ diff --git a/stream/realrtsp/asmrp.h b/stream/realrtsp/asmrp.h index ab80898c98..1d073e6aeb 100644 --- a/stream/realrtsp/asmrp.h +++ b/stream/realrtsp/asmrp.h @@ -44,4 +44,4 @@ int asmrp_match (const char *rules, int bandwidth, int *matches) ; -#endif +#endif /* HAVE_ASMRP_H */ diff --git a/stream/realrtsp/real.h b/stream/realrtsp/real.h index c37f5af5d1..fd78edfc78 100644 --- a/stream/realrtsp/real.h +++ b/stream/realrtsp/real.h @@ -57,5 +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 - +#endif /* HAVE_REAL_H */ diff --git a/stream/realrtsp/rmff.h b/stream/realrtsp/rmff.h index 3124645e32..807c05e2ce 100644 --- a/stream/realrtsp/rmff.h +++ b/stream/realrtsp/rmff.h @@ -273,4 +273,4 @@ void rmff_dump_pheader(rmff_pheader_t *h, char *data); */ void rmff_free_header(rmff_header_t *h); -#endif +#endif /* HAVE_RMFF_H */ diff --git a/stream/realrtsp/sdpplin.h b/stream/realrtsp/sdpplin.h index 2872a40f5e..24a7f206a4 100644 --- a/stream/realrtsp/sdpplin.h +++ b/stream/realrtsp/sdpplin.h @@ -105,5 +105,4 @@ sdpplin_t *sdpplin_parse(char *data); void sdpplin_free(sdpplin_t *description); -#endif - +#endif /* HAVE_SDPPLIN_H */ diff --git a/stream/realrtsp/xbuffer.h b/stream/realrtsp/xbuffer.h index 8192258503..ecc72c0bac 100644 --- a/stream/realrtsp/xbuffer.h +++ b/stream/realrtsp/xbuffer.h @@ -23,4 +23,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 +#endif /* XCL_H */ diff --git a/stream/rtp.h b/stream/rtp.h index 2bbabc3e4f..c451536414 100644 --- a/stream/rtp.h +++ b/stream/rtp.h @@ -10,4 +10,4 @@ int read_rtp_from_server(int fd, char *buffer, int length); -#endif +#endif /* RTP_H */ diff --git a/stream/stream_dvdnav.h b/stream/stream_dvdnav.h index 41c55b1e71..de4b5eb765 100644 --- a/stream/stream_dvdnav.h +++ b/stream/stream_dvdnav.h @@ -35,4 +35,4 @@ void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* but 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 */ @@ -6,5 +6,5 @@ extern int subcc_enabled; void subcc_init(void); void subcc_process_data(unsigned char *inputdata,unsigned int len); -#endif /*SUB_CC_H*/ +#endif /* SUB_CC_H */ diff --git a/subopt-helper.h b/subopt-helper.h index 7b8bd8cb5f..f9d17a0715 100644 --- a/subopt-helper.h +++ b/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 +#endif /* SUBOPT_HELPER_H */ diff --git a/subreader.h b/subreader.h index c6c18dc550..789f66bbec 100644 --- a/subreader.h +++ b/subreader.h @@ -89,4 +89,5 @@ void find_sub(sub_data* subd,int key); 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 */ diff --git a/vidix/dha.h b/vidix/dha.h index 1cc0781062..bb9a24a022 100644 --- a/vidix/dha.h +++ b/vidix/dha.h @@ -92,4 +92,4 @@ extern int mtrr_set_type(unsigned base,unsigned size,int type); } #endif -#endif +#endif /* LIBDHA_H */ diff --git a/vidix/dhahelperwin/dhahelper.h b/vidix/dhahelperwin/dhahelper.h index 6ff97905cb..80adabea01 100644 --- a/vidix/dhahelperwin/dhahelper.h +++ b/vidix/dhahelperwin/dhahelper.h @@ -68,4 +68,4 @@ struct __attribute__((__packed__)) dhahelper_t { typedef struct dhahelper_t dhahelper_t; -#endif +#endif /* _DHAHELPER_H */ diff --git a/vidix/fourcc.h b/vidix/fourcc.h index c7ed97573a..d048015bee 100644 --- a/vidix/fourcc.h +++ b/vidix/fourcc.h @@ -79,4 +79,4 @@ /* Vendor-specific formats */ #define IMGFMT_WNVA vid_fourcc('W','N','V','A') /* Winnov hw compress */ -#endif +#endif /* FOURCC_H */ diff --git a/vidix/vidix.h b/vidix/vidix.h index b962bb61b6..0b99db1f13 100644 --- a/vidix/vidix.h +++ b/vidix/vidix.h @@ -314,4 +314,4 @@ typedef struct vidix_oem_fx_s } #endif -#endif +#endif /* VIDIX_H */ diff --git a/vidix/vidixlib.h b/vidix/vidixlib.h index c3a065a28c..f4b258dc41 100644 --- a/vidix/vidixlib.h +++ b/vidix/vidixlib.h @@ -141,4 +141,4 @@ int vdlPlaybackCopyFrame(VDL_HANDLE, const vidix_dma_t * ); } #endif -#endif +#endif /* VIDIXLIB_H */ diff --git a/xvid_vbr.h b/xvid_vbr.h index df56d13e57..3d198b96a1 100644 --- a/xvid_vbr.h +++ b/xvid_vbr.h @@ -228,4 +228,4 @@ extern int vbrUpdate(vbr_control_t *state, int ublocks); extern int vbrFinish(vbr_control_t *state); -#endif +#endif /* XVID_VBR_H */ |