Make various functions static

28 files changed, 60 insertions, 68 deletions

diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 0437b39a24..24c2f0668e 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -147,7 +147,7 @@ static int control(int cmd,void *arg){
 }
 
 // SDL Callback function
-void outputaudio(void *unused, Uint8 *stream, int len) {
+static void outputaudio(void *unused, Uint8 *stream, int len) {
 	//SDL_MixAudio(stream, read_buffer(buffers, len), len, SDL_MIX_MAXVOLUME);
 	//if(!full_buffers) printf("SDL: Buffer underrun!\n");
 
diff --git a/libass/ass_render.c b/libass/ass_render.c
index 0ed4054ffa..894d8e6711 100644
--- a/libass/ass_render.c
+++ b/libass/ass_render.c
@@ -2010,7 +2010,7 @@ static int ass_render_event(ass_event_t* event, event_images_t* event_images)
  * \brief deallocate image list
  * \param img list pointer
  */
-void ass_free_images(ass_image_t* img)
+static void ass_free_images(ass_image_t* img)
 {
 	while (img) {
 		ass_image_t* next = img->next;
@@ -2318,7 +2318,7 @@ static void fix_collisions(event_images_t* imgs, int cnt)
  * \param i2 second image
  * \return 0 if identical, 1 if different positions, 2 if different content
  */
-int ass_image_compare(ass_image_t *i1, ass_image_t *i2)
+static int ass_image_compare(ass_image_t *i1, ass_image_t *i2)
 {
 	if (i1->w != i2->w) return 2;
 	if (i1->h != i2->h) return 2;
@@ -2336,7 +2336,7 @@ int ass_image_compare(ass_image_t *i1, ass_image_t *i2)
  * \param priv library handle
  * \return 0 if identical, 1 if different positions, 2 if different content
  */
-int ass_detect_change(ass_renderer_t *priv)
+static int ass_detect_change(ass_renderer_t *priv)
 {
 	ass_image_t* img, *img2;
 	int diff;
diff --git a/libmenu/menu.c b/libmenu/menu.c
index cb02e5bb51..ae69de4160 100644
--- a/libmenu/menu.c
+++ b/libmenu/menu.c
@@ -79,7 +79,7 @@ static menu_cmd_bindings_t *cmd_bindings = NULL;
 static int cmd_bindings_num = 0;
 
 
-menu_cmd_bindings_t *get_cmd_bindings(const char *name) {
+static menu_cmd_bindings_t *get_cmd_bindings(const char *name) {
   int i;
   for (i = 0; i < cmd_bindings_num; ++i)
     if (!strcasecmp(cmd_bindings[i].name, name))
@@ -718,7 +718,7 @@ int menu_text_num_lines(char* txt, int max_width) {
   return l;
 }
   
-char* menu_text_get_next_line(char* txt, int max_width) {
+static char* menu_text_get_next_line(char* txt, int max_width) {
   int i = 0;
   render_txt(txt);
   while (*txt) {
diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c
index a47f2183ef..5f3e48ae2c 100644
--- a/libmpcodecs/ad_liba52.c
+++ b/libmpcodecs/ad_liba52.c
@@ -49,7 +49,7 @@ static const ad_info_t info =
 
 LIBAD_EXTERN(liba52)
 
-int a52_fillbuff(sh_audio_t *sh_audio){
+static int a52_fillbuff(sh_audio_t *sh_audio){
 int length=0;
 int flags=0;
 int sample_rate=0;
@@ -111,7 +111,7 @@ int channels=0;
   return (flags&A52_LFE) ? (channels+1) : channels;
 }
 
-sample_t dynrng_call (sample_t c, void *data) {
+static sample_t dynrng_call (sample_t c, void *data) {
 //	fprintf(stderr, "(%lf, %lf): %lf\n", (double)c, (double)a52_drc_level, (double)pow((double)c, a52_drc_level));
 	return pow((double)c, a52_drc_level);
 }
diff --git a/libmpcodecs/native/rtjpegn.c b/libmpcodecs/native/rtjpegn.c
index de72e5bd8e..be24f12851 100644
--- a/libmpcodecs/native/rtjpegn.c
+++ b/libmpcodecs/native/rtjpegn.c
@@ -136,7 +136,7 @@ static const unsigned char RTjpeg_chrom_quant_tbl[64] = {
 /* Block to Stream (encoding)                         */
 /*                                                    */
 
-int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
+static int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
 {
  register int ci, co=1;
  register __s16 ZZvalue;
@@ -306,7 +306,7 @@ fprintf(stdout, "\n\n");
 /* Stream to Block  (decoding)                        */
 /*                                                    */
 
-int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
+static int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
 {
  int ci;
  register int co;
@@ -450,7 +450,7 @@ fprintf(stdout, "\n\n");
 
 #else
 
-int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
+static int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
 {
  register int ci, co=1, tmp;
  register __s16 ZZvalue;
@@ -509,7 +509,7 @@ int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
  return (int)co;
 }
 
-int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
+static int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
 {
  int ci=1, co=1, tmp;
  register int i;
@@ -542,7 +542,7 @@ int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
 #endif
 
 #if defined(MMX)
-void RTjpeg_quant_init(void)
+static void RTjpeg_quant_init(void)
 {
  int i;
  __s16 *qtbl;
@@ -557,7 +557,7 @@ void RTjpeg_quant_init(void)
 static mmx_t RTjpeg_ones={0x0001000100010001LL};
 static mmx_t RTjpeg_half={0x7fff7fff7fff7fffLL};
 
-void RTjpeg_quant(__s16 *block, __s32 *qtbl)
+static void RTjpeg_quant(__s16 *block, __s32 *qtbl)
 {
  int i;
  mmx_t *bl, *ql;
@@ -594,11 +594,11 @@ void RTjpeg_quant(__s16 *block, __s32 *qtbl)
  }
 }
 #else
-void RTjpeg_quant_init(void)
+static void RTjpeg_quant_init(void)
 {
 }
 
-void RTjpeg_quant(__s16 *block, __s32 *qtbl)
+static void RTjpeg_quant(__s16 *block, __s32 *qtbl)
 {
  int i;
  
@@ -629,7 +629,7 @@ static mmx_t RTjpeg_zero ={0x0000000000000000LL};
 #define D_MULTIPLY(var,const)  ((__s32) ((var) * (const)))
 #endif
 
-void RTjpeg_dct_init(void)
+static void RTjpeg_dct_init(void)
 {
  int i;
  
@@ -640,7 +640,7 @@ void RTjpeg_dct_init(void)
  }
 }
 
-void RTjpeg_dctY(__u8 *idata, __s16 *odata, int rskip)
+static void RTjpeg_dctY(__u8 *idata, __s16 *odata, int rskip)
 {
 #ifndef MMX
   __s32 tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7;
@@ -1557,7 +1557,7 @@ void RTjpeg_dctY(__u8 *idata, __s16 *odata, int rskip)
 #define RL(x) ((x)>235) ? 235 : (((x)<16) ? 16 : (x))
 #define MULTIPLY(var,const)  (((__s32) ((var) * (const)) + 128)>>8)
 
-void RTjpeg_idct_init(void)
+static void RTjpeg_idct_init(void)
 {
  int i;
  
@@ -1568,7 +1568,7 @@ void RTjpeg_idct_init(void)
  }
 }
 
-void RTjpeg_idct(__u8 *odata, __s16 *data, int rskip)
+static void RTjpeg_idct(__u8 *odata, __s16 *data, int rskip)
 {
 #ifdef MMX
 
@@ -2705,7 +2705,7 @@ Initialise all the cache-aliged data blocks
 
 */
 
-void RTjpeg_init_data(void)
+static void RTjpeg_init_data(void)
 {
  unsigned long dptr;
  
@@ -3143,7 +3143,7 @@ void RTjpeg_init_mcompress(void)
 
 #ifdef MMX
 
-int RTjpeg_bcomp(__s16 *old, mmx_t *mask)
+static int RTjpeg_bcomp(__s16 *old, mmx_t *mask)
 {
  int i;
  mmx_t *mold=(mmx_t *)old;
@@ -3189,7 +3189,7 @@ int RTjpeg_bcomp(__s16 *old, mmx_t *mask)
 }
 
 #else
-int RTjpeg_bcomp(__s16 *old, __u16 *mask)
+static int RTjpeg_bcomp(__s16 *old, __u16 *mask)
 {
  int i;
 
@@ -3415,10 +3415,6 @@ int RTjpeg_mcompress8(__s8 *sp, unsigned char *bp, __u16 lmask)
  return (sp-sb);
 }
 
-void RTjpeg_color_init(void)
-{
-}  
-
 #define KcrR 76284
 #define KcrG 53281
 #define KcbG 25625
diff --git a/libmpcodecs/native/xa_gsm.c b/libmpcodecs/native/xa_gsm.c
index 546edf81dc..86cedeb48b 100644
--- a/libmpcodecs/native/xa_gsm.c
+++ b/libmpcodecs/native/xa_gsm.c
@@ -258,7 +258,7 @@ register word 	* s;
 }
 
 /**** 4.3.2 */
-void Gsm_Long_Term_Synthesis_Filtering (S,Ncr,bcr,erp,drp)
+static void Gsm_Long_Term_Synthesis_Filtering (S,Ncr,bcr,erp,drp)
 XA_GSM_STATE        * S;
 word                    Ncr;
 word                    bcr;
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index faf9a86e42..be3012a795 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -143,7 +143,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){
     return CONTROL_UNKNOWN;
 }
 
-void mp_msp_av_log_callback(void* ptr, int level, const char* fmt, va_list vl)
+static void mp_msp_av_log_callback(void* ptr, int level, const char* fmt, va_list vl)
 {
     static int print_prefix=1;
     AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
@@ -704,7 +704,7 @@ typedef struct dp_hdr_s {
     uint32_t chunktab;	// offset to chunk offset array
 } dp_hdr_t;
 
-void swap_palette(void *pal) {
+static void swap_palette(void *pal) {
     int i;
     uint32_t *p = pal;
     for (i = 0; i < AVPALETTE_COUNT; i++)
diff --git a/libmpcodecs/vd_ijpg.c b/libmpcodecs/vd_ijpg.c
index bd72cef175..3338067872 100644
--- a/libmpcodecs/vd_ijpg.c
+++ b/libmpcodecs/vd_ijpg.c
@@ -93,7 +93,7 @@ METHODDEF(void) skip_input_data (j_decompress_ptr cinfo, long num_bytes)
 
 METHODDEF(void) term_source (j_decompress_ptr cinfo) { }
 
-GLOBAL(void) jpeg_buf_src ( j_decompress_ptr cinfo, char * inbuf,int bufsize )
+static void jpeg_buf_src ( j_decompress_ptr cinfo, char * inbuf,int bufsize )
 {
  my_src_ptr src;
  if (cinfo->src == NULL) cinfo->src=malloc( sizeof( my_source_mgr ) );
diff --git a/libmpcodecs/vf_2xsai.c b/libmpcodecs/vf_2xsai.c
index efa58611e6..7405606697 100644
--- a/libmpcodecs/vf_2xsai.c
+++ b/libmpcodecs/vf_2xsai.c
@@ -25,7 +25,7 @@ static int PixelsPerMask = 2;
 #define makecol(r,g,b) (r+(g<<8)+(b<<16))
 #define makecol_depth(d,r,g,b) (r+(g<<8)+(b<<16))
 
-int Init_2xSaI(int d)
+static int Init_2xSaI(int d)
 {
 
 	int minr = 0, ming = 0, minb = 0;
@@ -77,7 +77,7 @@ int Init_2xSaI(int d)
 	+ ((((A & qlowpixelMask) + (B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask)) >> 2) & qlowpixelMask)
 
 
-void Super2xSaI_ex(uint8_t *src, uint32_t src_pitch, 
+static void Super2xSaI_ex(uint8_t *src, uint32_t src_pitch, 
 		   uint8_t *dst, uint32_t dst_pitch,
 		   uint32_t width, uint32_t height, int sbpp) {
 
diff --git a/libmpcodecs/vf_remove_logo.c b/libmpcodecs/vf_remove_logo.c
index a5a1b2abc0..d378fec59c 100644
--- a/libmpcodecs/vf_remove_logo.c
+++ b/libmpcodecs/vf_remove_logo.c
@@ -881,7 +881,7 @@ static int open(vf_instance_t * vf, char * args)
  *
  * This is called at exit-time.
  */
-void uninit(vf_instance_t * vf)
+static void uninit(vf_instance_t * vf)
 {
   /* Destroy our masks and images. */
   destroy_pgm(((vf_priv_s *)vf->priv)->filter);
diff --git a/libmpcodecs/vf_screenshot.c b/libmpcodecs/vf_screenshot.c
index ce9c5101b8..7770dd4de0 100644
--- a/libmpcodecs/vf_screenshot.c
+++ b/libmpcodecs/vf_screenshot.c
@@ -205,7 +205,7 @@ static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts)
     return vf_next_put_image(vf, dmpi, pts);
 }
 
-int control (vf_instance_t *vf, int request, void *data)
+static int control (vf_instance_t *vf, int request, void *data)
 {
     /** data contains an integer argument
      * 0: take screenshot with the next frame
diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c
index 7fed0abc43..ea0774c553 100644
--- a/libmpdemux/demux_avi.c
+++ b/libmpdemux/demux_avi.c
@@ -264,7 +264,7 @@ do{
 // return value:
 //     0 = EOF or no stream found
 //     1 = successfully read a packet
-int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t* ds){
+static int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t* ds){
 avi_priv_t *priv=demux->priv;
 unsigned int id=0;
 unsigned int len;
@@ -328,7 +328,7 @@ do{
 // return value:
 //     0 = EOF or no stream found
 //     1 = successfully read a packet
-int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t* ds){
+static int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t* ds){
 avi_priv_t *priv=demux->priv;
 unsigned int id=0;
 unsigned int len;
@@ -559,7 +559,7 @@ static demuxer_t* demux_open_avi(demuxer_t* demuxer){
 }
 
 
-void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
+static void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){
     avi_priv_t *priv=demuxer->priv;
     demux_stream_t *d_audio=demuxer->audio;
     demux_stream_t *d_video=demuxer->video;
@@ -732,7 +732,7 @@ void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int
 }
 
 
-void demux_close_avi(demuxer_t *demuxer) {
+static void demux_close_avi(demuxer_t *demuxer) {
   avi_priv_t* priv=demuxer->priv;
 
   if(!priv)
diff --git a/libmpdemux/demux_avs.c b/libmpdemux/demux_avs.c
index 2f8ec46bde..3fb19c1ec3 100644
--- a/libmpdemux/demux_avs.c
+++ b/libmpdemux/demux_avs.c
@@ -84,7 +84,7 @@ typedef struct tagAVS
     imp_avs_get_audio avs_get_audio;
 } AVS_T;
 
-AVS_T *initAVS(const char *filename)
+static AVS_T *initAVS(const char *filename)
 {   
     AVS_T *AVS = malloc (sizeof(AVS_T));
     AVS_Value arg0 = avs_new_value_string(filename);
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index d23459d3c7..a17d0966bd 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -143,7 +143,7 @@ typedef struct {
     void* desc; // image/sound/etc description (pointer to ImageDescription etc)
 } mov_track_t;
 
-void mov_build_index(mov_track_t* trak,int timescale){
+static void mov_build_index(mov_track_t* trak,int timescale){
     int i,j,s;
     int last=trak->chunks_size;
     unsigned int pts=0;
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c
index 55da5f00a6..74c35ebcf7 100644
--- a/libmpdemux/demux_mpg.c
+++ b/libmpdemux/demux_mpg.c
@@ -794,7 +794,7 @@ static int demux_mpg_gxf_fill_buffer(demuxer_t *demux, demux_stream_t *ds) {
   return 1;
 }
 
-int demux_mpg_fill_buffer(demuxer_t *demux, demux_stream_t *ds){
+static int demux_mpg_fill_buffer(demuxer_t *demux, demux_stream_t *ds){
 unsigned int head=0;
 int skipped=0;
 int max_packs=256; // 512kbyte
@@ -881,7 +881,7 @@ do{
 
 extern void skip_audio_frame(sh_audio_t *sh_audio);
 
-void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, int flags){
+static void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, int flags){
     demux_stream_t *d_audio=demuxer->audio;
     demux_stream_t *d_video=demuxer->video;
     sh_audio_t *sh_audio=d_audio->sh;
@@ -987,7 +987,7 @@ void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, in
     }
 }
 
-int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){
+static int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){
     mpg_demuxer_t *mpg_d=(mpg_demuxer_t*)demuxer->priv;
 
     switch(cmd) {
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index d4e10d29b9..3a096cc5a0 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -158,7 +158,7 @@ extern char *dvdsub_lang, *audio_lang;
 static subtitle ogg_sub;
 //FILE* subout;
 
-void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) {
+static void demux_ogg_add_sub (ogg_stream_t* os,ogg_packet* pack) {
   int lcv;
   char *packet = pack->packet;
 
@@ -491,7 +491,7 @@ static int demux_ogg_add_packet(demux_stream_t* ds,ogg_stream_t* os,int id,ogg_p
 
 /// if -forceidx build a table of all syncpoints to make seeking easier
 /// otherwise try to get at least the final_granulepos
-void demux_ogg_scan_stream(demuxer_t* demuxer) {
+static void demux_ogg_scan_stream(demuxer_t* demuxer) {
   ogg_demuxer_t* ogg_d = demuxer->priv;
   stream_t *s = demuxer->stream;
   ogg_sync_state* sync = &ogg_d->sync;
diff --git a/libmpdemux/demux_pva.c b/libmpdemux/demux_pva.c
index 2ff8be63e3..af16f1c3da 100644
--- a/libmpdemux/demux_pva.c
+++ b/libmpdemux/demux_pva.c
@@ -62,7 +62,7 @@ typedef struct {
 
 
 
-int pva_sync(demuxer_t * demuxer)
+static int pva_sync(demuxer_t * demuxer)
 {
 	uint8_t buffer[5]={0,0,0,0,0};
 	int count;
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 7c55ddcab7..caabdc5415 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -261,7 +261,7 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid)
     return demuxer->s_streams[id];
 }
 
-void free_sh_sub(sh_sub_t *sh)
+static void free_sh_sub(sh_sub_t *sh)
 {
     mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh);
     free(sh->extradata);
diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c
index 568b67fec0..da1826215c 100644
--- a/libmpdemux/mp3_hdr.c
+++ b/libmpdemux/mp3_hdr.c
@@ -20,7 +20,7 @@ static long freqs[9] = { 44100, 48000, 32000,	// MPEG 1.0
 			 22050, 24000, 16000,   // MPEG 2.0
 			 11025, 12000,  8000};  // MPEG 2.5
 
-int mp_mp3_get_lsf(unsigned char* hbuf){
+static int mp_mp3_get_lsf(unsigned char* hbuf){
     unsigned long newhead = 
       hbuf[0] << 24 |
       hbuf[1] << 16 |
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c
index 19d55da804..3b3d5f8f50 100644
--- a/libvo/vo_aa.c
+++ b/libvo/vo_aa.c
@@ -88,7 +88,7 @@ int aaopt_subcolor = AA_SPECIAL;
 
 static unsigned char vo_osd_text[64];
 
-void
+static void
 resize(void){
     /* 
      * this function is called by aa lib if windows resizes
diff --git a/libvo/vo_mpegpes.c b/libvo/vo_mpegpes.c
index 6499326189..a113fa32f2 100644
--- a/libvo/vo_mpegpes.c
+++ b/libvo/vo_mpegpes.c
@@ -207,15 +207,10 @@ static int my_write(unsigned char* data,int len){
     return orig_len;
 }
 
-void send_pes_packet(unsigned char* data,int len,int id,int timestamp){
+static void send_pes_packet(unsigned char* data,int len,int id,int timestamp){
     send_mpeg_pes_packet (data, len, id, timestamp, 1, my_write);
 }
 
-void send_lpcm_packet(unsigned char* data,int len,int id,unsigned int timestamp,int freq_id){
-    send_mpeg_lpcm_packet(data, len, id, timestamp, freq_id, my_write);
-}
-
-
 static int draw_frame(uint8_t * src[])
 {
     vo_mpegpes_t *p=(vo_mpegpes_t *)src[0];
diff --git a/mplayer.c b/mplayer.c
index 39794b27c2..f6597bc9a4 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2396,7 +2396,7 @@ static void pause_loop(struct MPContext *mpctx)
 #endif
 }
 
-void print_version(void){
+static void print_version(void){
   mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s\n", MP_TITLE);
 
 /* Test for CPU capabilities (and corresponding OS support) for optimizing */
diff --git a/playtree.c b/playtree.c
index ead621b4fe..c499e8d1d7 100644
--- a/playtree.c
+++ b/playtree.c
@@ -406,7 +406,7 @@ play_tree_set_params_from(play_tree_t* dest,play_tree_t* src) {
 }
 
 // all children if deep < 0
-void
+static void
 play_tree_set_flag(play_tree_t* pt, int flags , int deep) {
   play_tree_t*  i;
 
@@ -419,7 +419,7 @@ play_tree_set_flag(play_tree_t* pt, int flags , int deep) {
   }
 }
 
-void
+static void
 play_tree_unset_flag(play_tree_t* pt, int flags , int deep) {
   play_tree_t*  i;
 
diff --git a/spudec.c b/spudec.c
index 5df8647318..a086227d22 100644
--- a/spudec.c
+++ b/spudec.c
@@ -741,8 +741,9 @@ static void scale_image(int x, int y, scale_pixel* table_x, scale_pixel* table_y
   }
 }
 
-void sws_spu_image(unsigned char *d1, unsigned char *d2, int dw, int dh, int ds,
-	unsigned char *s1, unsigned char *s2, int sw, int sh, int ss)
+static void sws_spu_image(unsigned char *d1, unsigned char *d2, int dw, int dh,
+                          int ds, unsigned char *s1, unsigned char *s2, int sw,
+                          int sh, int ss)
 {
 	struct SwsContext *ctx;
 	static SwsFilter filter;
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index f97a2ff5c8..92b06c67bb 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -324,7 +324,7 @@ static int dvd_next_cell(dvd_priv_t *d) {
   return next_cell;
 }
 
-int dvd_read_sector(dvd_priv_t *d,unsigned char* data) {
+static int dvd_read_sector(dvd_priv_t *d,unsigned char* data) {
   int len;
 
   if(d->packs_left==0) {
@@ -443,7 +443,7 @@ read_next:
   return d->cur_pack-1;
 }
 
-void dvd_seek(dvd_priv_t *d,int pos) {
+static void dvd_seek(dvd_priv_t *d,int pos) {
   d->packs_left=-1;
   d->cur_pack=pos;
 
@@ -481,7 +481,7 @@ void dvd_seek(dvd_priv_t *d,int pos) {
   d->angle_seek=1;
 }
 
-void dvd_close(dvd_priv_t *d) {
+static void dvd_close(dvd_priv_t *d) {
   ifoClose(d->vts_file);
   ifoClose(d->vmg_file);
   DVDCloseFile(d->title);
diff --git a/stream/tv.c b/stream/tv.c
index 58321d5302..641737a9f1 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -337,7 +337,7 @@ int tv_set_norm(tvi_handle_t *tvh, char* norm)
     return 1;
 }
 
-int tv_set_norm_i(tvi_handle_t *tvh, int norm)
+static int tv_set_norm_i(tvi_handle_t *tvh, int norm)
 {
    tvh->norm = norm;
 
diff --git a/subreader.c b/subreader.c
index c64ff460cc..504f50d383 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1150,7 +1150,7 @@ subtitle* subcp_recode (subtitle *sub)
 #ifndef max
 #define max(a,b)  (((a)>(b))?(a):(b))
 #endif
-subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
+static subtitle* sub_fribidi (subtitle *sub, int sub_utf8)
 {
   FriBidiChar logical[LINE_LEN+1], visual[LINE_LEN+1]; // Hopefully these two won't smash the stack
   char        *ip      = NULL, *op     = NULL;
diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c
index c53fa93d64..30e30a9e38 100644
--- a/vidix/nvidia_vid.c
+++ b/vidix/nvidia_vid.c
@@ -441,12 +441,12 @@ struct rivatv_info {
 };
 typedef struct rivatv_info rivatv_info;
 
-uint8_t nvReadVGA (struct rivatv_chip *chip, int index) {
+static uint8_t nvReadVGA (struct rivatv_chip *chip, int index) {
 	VID_WR08 (chip->PCIO, 0x3D4, index);
 	return VID_RD08 (chip->PCIO, 0x3D5);
 }
 
-void nvWriteVGA (struct rivatv_chip *chip, int index, int data) {
+static void nvWriteVGA (struct rivatv_chip *chip, int index, int data) {
 	VID_WR08 (chip->PCIO, 0x3D4, index);
 	VID_WR08 (chip->PCIO, 0x3D5, data);
 }