diff options
-rw-r--r-- | libass/ass_bitmap.c | 2 | ||||
-rw-r--r-- | libass/ass_bitmap.h | 2 | ||||
-rw-r--r-- | libass/ass_mp.c | 2 | ||||
-rw-r--r-- | libass/ass_mp.h | 2 | ||||
-rw-r--r-- | libass/ass_render.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ad_libdv.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_libdv.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vd_xanim.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_mpg.c | 2 | ||||
-rw-r--r-- | libvo/vo_directfb2.c | 2 | ||||
-rw-r--r-- | libvo/vo_svga.c | 2 | ||||
-rw-r--r-- | libvo/vo_x11.c | 2 | ||||
-rw-r--r-- | libvo/x11_common.c | 6 | ||||
-rw-r--r-- | libvo/x11_common.h | 4 | ||||
-rw-r--r-- | mp_msg.c | 2 | ||||
-rw-r--r-- | osdep/getch2-win.c | 2 | ||||
-rw-r--r-- | osdep/getch2.c | 2 |
17 files changed, 22 insertions, 22 deletions
diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c index 6a686673c7..8aa1fe7a65 100644 --- a/libass/ass_bitmap.c +++ b/libass/ass_bitmap.c @@ -104,7 +104,7 @@ static void resize_tmp(ass_synth_priv_t* priv, int w, int h) priv->tmp = malloc((priv->tmp_w + 1) * priv->tmp_h * sizeof(short)); } -ass_synth_priv_t* ass_synth_init() +ass_synth_priv_t* ass_synth_init(void) { ass_synth_priv_t* priv = calloc(1, sizeof(ass_synth_priv_t)); generate_tables(priv, blur_radius); diff --git a/libass/ass_bitmap.h b/libass/ass_bitmap.h index a4090636cb..ba5867f7cc 100644 --- a/libass/ass_bitmap.h +++ b/libass/ass_bitmap.h @@ -23,7 +23,7 @@ typedef struct ass_synth_priv_s ass_synth_priv_t; -ass_synth_priv_t* ass_synth_init(); +ass_synth_priv_t* ass_synth_init(void); void ass_synth_done(ass_synth_priv_t* priv); typedef struct bitmap_s { diff --git a/libass/ass_mp.c b/libass/ass_mp.c index b572824e01..e2c1092bca 100644 --- a/libass/ass_mp.c +++ b/libass/ass_mp.c @@ -240,7 +240,7 @@ void ass_configure_fonts(ass_renderer_t* priv) { free(family); } -ass_library_t* ass_init() { +ass_library_t* ass_init(void) { ass_library_t* priv; char* path = get_path("fonts"); priv = ass_library_init(); diff --git a/libass/ass_mp.h b/libass/ass_mp.h index ac9bacc0bd..5d8b722c28 100644 --- a/libass/ass_mp.h +++ b/libass/ass_mp.h @@ -42,7 +42,7 @@ ass_track_t* ass_read_subdata(ass_library_t* library, sub_data* subdata, double void ass_configure(ass_renderer_t* priv, int w, int h); void ass_configure_fonts(ass_renderer_t* priv); -ass_library_t* ass_init(); +ass_library_t* ass_init(void); typedef struct { ass_image_t* imgs; diff --git a/libass/ass_render.c b/libass/ass_render.c index 11f90b5a58..4532cab971 100644 --- a/libass/ass_render.c +++ b/libass/ass_render.c @@ -680,7 +680,7 @@ static unsigned interpolate_alpha(long long now, return a; } -static void reset_render_context(); +static void reset_render_context(void); /** * \brief Parse style override tag. @@ -1293,7 +1293,7 @@ static void get_glyph(int symbol, glyph_info_t* info, FT_Vector* advance) * lines[].asc * lines[].desc */ -static void measure_text() +static void measure_text(void) { int cur_line = 0, max_asc = 0, max_desc = 0; int i; diff --git a/libmpcodecs/ad_libdv.c b/libmpcodecs/ad_libdv.c index ea7979c64c..e0dfbb2166 100644 --- a/libmpcodecs/ad_libdv.c +++ b/libmpcodecs/ad_libdv.c @@ -32,7 +32,7 @@ static ad_info_t info = LIBAD_EXTERN(libdv) // defined in vd_libdv.c: -dv_decoder_t* init_global_rawdv_decoder(); +dv_decoder_t* init_global_rawdv_decoder(void); static int preinit(sh_audio_t *sh_audio) { diff --git a/libmpcodecs/vd_libdv.c b/libmpcodecs/vd_libdv.c index d19d1d524e..f7c1e4db03 100644 --- a/libmpcodecs/vd_libdv.c +++ b/libmpcodecs/vd_libdv.c @@ -36,7 +36,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ static dv_decoder_t* global_rawdv_decoder=NULL; -dv_decoder_t* init_global_rawdv_decoder() +dv_decoder_t* init_global_rawdv_decoder(void) { if(!global_rawdv_decoder){ global_rawdv_decoder=dv_decoder_new(TRUE,TRUE,FALSE); diff --git a/libmpcodecs/vd_xanim.c b/libmpcodecs/vd_xanim.c index 91252975ab..d7ff091846 100644 --- a/libmpcodecs/vd_xanim.c +++ b/libmpcodecs/vd_xanim.c @@ -356,12 +356,12 @@ void XA_Add_Func_To_Free_Chain(XA_ANIM_HDR *anim_hdr, void (*function)()) } -unsigned long XA_Time_Read() +unsigned long XA_Time_Read(void) { return GetTimer(); //(GetRelativeTime()); } -void XA_dummy() +void XA_dummy(void) { XA_Print("dummy() called"); } diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 7c0ed1da22..ed53145ad4 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -576,7 +576,7 @@ static int num_h264_pps=0; static int num_mp3audio_packets=0; -static void clear_stats() +static void clear_stats(void) { num_elementary_packets100=0; num_elementary_packets101=0; diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 376a011d1e..15e56a886a 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -139,7 +139,7 @@ static int field_parity = -1; * implementation * ******************************/ -void unlock() { +void unlock(void) { if (frame && framelocked) frame->Unlock(frame); if (primary && primarylocked) primary->Unlock(primary); } diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index affdaf1e36..acd2a104f6 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -109,7 +109,7 @@ LIBVO_EXTERN(svga) //return number of 1'st free page or -1 if no free one -static inline int page_find_free(){ +static inline int page_find_free(void){ int i; for(i=0;i<max_pages;i++) if(PageStore[i].locks == PAGE_EMPTY) return i; diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index f94d5c9c30..05b6efc7e6 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -93,7 +93,7 @@ static int aspect; // 1<<16 based fixed point aspect, so that the a static int old_vo_dwidth = -1; static int old_vo_dheight = -1; -static void check_events() +static void check_events(void) { int ret = vo_x11_check_events(mDisplay); diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 42f1bfd143..29f0e3bf58 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -2287,7 +2287,7 @@ static Atom xv_intern_atom_if_exists( char const * atom_name ) * \brief Try to enable vsync for xv. * \return Returns -1 if not available, 0 on failure and 1 on success. */ -int vo_xv_enable_vsync() +int vo_xv_enable_vsync(void) { Atom xv_atom = xv_intern_atom_if_exists("XV_SYNC_TO_VBLANK"); if (xv_atom == None) @@ -2343,7 +2343,7 @@ void vo_xv_get_max_img_dim( uint32_t * width, uint32_t * height ) * Outputs the content of |ck_handling| as a readable message. * */ -void vo_xv_print_ck_info() +void vo_xv_print_ck_info(void) { mp_msg( MSGT_VO, MSGL_V, "[xv common] " ); @@ -2411,7 +2411,7 @@ void vo_xv_print_ck_info() * NOTE: If vo_colorkey has bits set after the first 3 low order bytes * we don't draw anything as this means it was forced to off. */ -int vo_xv_init_colorkey() +int vo_xv_init_colorkey(void) { Atom xv_atom; int rez; diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 2e9e575486..4bae3b0768 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -74,7 +74,7 @@ extern unsigned int xv_port; extern int vo_xv_set_eq(uint32_t xv_port, char * name, int value); extern int vo_xv_get_eq(uint32_t xv_port, char * name, int *value); -extern int vo_xv_enable_vsync(); +extern int vo_xv_enable_vsync(void); extern void vo_xv_get_max_img_dim( uint32_t * width, uint32_t * height ); @@ -96,7 +96,7 @@ typedef struct xv_ck_info_s extern xv_ck_info_t xv_ck_info; extern unsigned long xv_colorkey; -extern int vo_xv_init_colorkey(); +extern int vo_xv_init_colorkey(void); extern void vo_xv_draw_colorkey(int32_t x, int32_t y, int32_t w, int32_t h); extern void xv_setup_colorkeyhandling(char const * ck_method_str, char const * ck_str); @@ -11,7 +11,7 @@ #ifdef USE_ICONV #include <iconv.h> #include <errno.h> -extern char* get_term_charset(); +extern char* get_term_charset(void); #endif #if defined(FOR_MENCODER) diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c index a20f1331f0..002d39d4a6 100644 --- a/osdep/getch2-win.c +++ b/osdep/getch2-win.c @@ -157,7 +157,7 @@ static const struct { { 0, NULL } }; -char* get_term_charset() +char* get_term_charset(void) { static char codepage[10]; unsigned i, cpno = GetConsoleOutputCP(); diff --git a/osdep/getch2.c b/osdep/getch2.c index a4226415f0..0d04de87b5 100644 --- a/osdep/getch2.c +++ b/osdep/getch2.c @@ -244,7 +244,7 @@ void getch2_disable(void){ } #ifdef USE_ICONV -char* get_term_charset() +char* get_term_charset(void) { char* charset = NULL; #ifdef USE_LANGINFO |