diff options
86 files changed, 208 insertions, 208 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index afa33e5626..275d973fda 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -747,7 +747,7 @@ static void codecs_free(codecs_t* codecs,int count) { free(codecs); } -void codecs_uninit_free() { +void codecs_uninit_free(void) { if (video_codecs) codecs_free(video_codecs,nr_vcodecs); video_codecs=NULL; diff --git a/codec-cfg.h b/codec-cfg.h index 49e9e2551c..54531cb9eb 100644 --- a/codec-cfg.h +++ b/codec-cfg.h @@ -68,6 +68,6 @@ codecs_t* find_codec(unsigned int fourcc, unsigned int *fourccmap, void select_codec(char* codecname,int audioflag); void list_codecs(int audioflag); void codecs_reset_selection(int audioflag); -void codecs_uninit_free(); +void codecs_uninit_free(void); #endif diff --git a/cpudetect.c b/cpudetect.c index 2261059ac1..ca00c8d7a3 100644 --- a/cpudetect.c +++ b/cpudetect.c @@ -45,7 +45,7 @@ static void check_os_katmai_support( void ); #if 1 // return TRUE if cpuid supported -static int has_cpuid() +static int has_cpuid(void) { long a, c; diff --git a/divx4_vbr.c b/divx4_vbr.c index 467f776910..f1d504cfed 100644 --- a/divx4_vbr.c +++ b/divx4_vbr.c @@ -316,17 +316,17 @@ int VbrControl_init_2pass_vbr_encoding(const char *filename, int bitrate, double return 0; } -int VbrControl_get_intra() +int VbrControl_get_intra(void) { return m_vFrames[m_iCount].is_key_frame; } -short VbrControl_get_drop() +short VbrControl_get_drop(void) { return m_bDrop; } -int VbrControl_get_quant() +int VbrControl_get_quant(void) { return m_iQuant; } @@ -340,7 +340,7 @@ void VbrControl_set_quant(float quant) if(m_iQuant>max_quantizer) m_iQuant=max_quantizer; } -void VbrControl_update_1pass_vbr() +void VbrControl_update_1pass_vbr(void) { VbrControl_set_quant(m_fQuant); m_iCount++; @@ -395,7 +395,7 @@ void VbrControl_update_2pass_vbr_encoding(int motion_bits, int texture_bits, int fprintf(m_pFile, ", new quant %d\n", m_iQuant); } -void VbrControl_close() +void VbrControl_close(void) { if(m_pFile) { diff --git a/divx4_vbr.h b/divx4_vbr.h index 10a400fcd8..ee26b23a89 100644 --- a/divx4_vbr.h +++ b/divx4_vbr.h @@ -5,13 +5,13 @@ int VbrControl_init_2pass_vbr_encoding(const char* filename, int bitrate, double framerate, int crispness, int quality); int VbrControl_init_2pass_vbr_analysis(const char* filename, int quality); - void VbrControl_update_1pass_vbr(); + void VbrControl_update_1pass_vbr(void); void VbrControl_update_2pass_vbr_encoding(int motion_bits, int texture_bits, int total_bits); void VbrControl_update_2pass_vbr_analysis(int is_key_frame, int motion_bits, int texture_bits, int total_bits, int quant); - int VbrControl_get_quant(); + int VbrControl_get_quant(void); void VbrControl_set_quant(float q); - int VbrControl_get_intra(); - short VbrControl_get_drop(); - void VbrControl_close(); + int VbrControl_get_intra(void); + short VbrControl_get_drop(void); + void VbrControl_close(void); @@ -54,7 +54,7 @@ void free_edl(edl_record_ptr next_edl_record) * \brief Fills EDL operations queue. */ -edl_record_ptr edl_parse_file() +edl_record_ptr edl_parse_file(void) { FILE *fd; char line[100]; @@ -24,6 +24,6 @@ extern char *edl_filename; // file to extract EDL entries from (-edl) 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(); // fills EDL stack +edl_record_ptr edl_parse_file(void); // fills EDL stack #endif diff --git a/liba52/bitstream.c b/liba52/bitstream.c index dc7564aff0..3a25001c57 100644 --- a/liba52/bitstream.c +++ b/liba52/bitstream.c @@ -59,7 +59,7 @@ void bitstream_set_ptr (uint8_t * buf) } static inline void -bitstream_fill_current() +bitstream_fill_current(void) { uint32_t tmp; diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index da0017d094..402f89264f 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -237,7 +237,7 @@ static void parse_device (char *dest, const char *src, int len) tmp[0] = ':'; } -static void print_help () +static void print_help (void) { mp_msg (MSGT_AO, MSGL_FATAL, "\n-ao alsa commandline help:\n" @@ -725,7 +725,7 @@ static void uninit(int immed) } } -static void audio_pause() +static void audio_pause(void) { int err; @@ -745,7 +745,7 @@ static void audio_pause() } } -static void audio_resume() +static void audio_resume(void) { int err; @@ -766,7 +766,7 @@ static void audio_resume() } /* stop playing and empty buffers (for seeking/pause) */ -static void reset() +static void reset(void) { int err; @@ -1030,7 +1030,7 @@ static int play_mmap(void* data, int len) } /* how many byes are free in the buffer */ -static int get_space() +static int get_space(void) { snd_pcm_status_t *status; int ret; @@ -1100,7 +1100,7 @@ static int get_space() } /* delay in seconds between first and last sample in buffer */ -static float get_delay() +static float get_delay(void) { if (alsa_handler) { diff --git a/libao2/ao_arts.c b/libao2/ao_arts.c index 35e678b9e0..96379560a0 100644 --- a/libao2/ao_arts.c +++ b/libao2/ao_arts.c @@ -112,24 +112,24 @@ static int play(void* data,int len,int flags) return arts_write(stream, data, len); } -static void audio_pause() +static void audio_pause(void) { } -static void audio_resume() +static void audio_resume(void) { } -static void reset() +static void reset(void) { } -static int get_space() +static int get_space(void) { return arts_stream_get(stream, ARTS_P_BUFFER_SPACE); } -static float get_delay() +static float get_delay(void) { return ((float) (ao_data.buffersize - arts_stream_get(stream, ARTS_P_BUFFER_SPACE))) / ((float) ao_data.bps); diff --git a/libao2/ao_esd.c b/libao2/ao_esd.c index 2ce2efc7c5..297787f6c8 100644 --- a/libao2/ao_esd.c +++ b/libao2/ao_esd.c @@ -346,7 +346,7 @@ static int play(void* data, int len, int flags) /* * stop playing, keep buffers (for pause) */ -static void audio_pause() +static void audio_pause(void) { /* * not possible with esd. the esd daemom will continue playing @@ -358,7 +358,7 @@ static void audio_pause() /* * resume playing, after audio_pause() */ -static void audio_resume() +static void audio_resume(void) { /* * not possible with esd. @@ -375,7 +375,7 @@ static void audio_resume() /* * stop playing and empty buffers (for seeking/pause) */ -static void reset() +static void reset(void) { #ifdef __svr4__ /* throw away data buffered in the esd connection */ @@ -388,7 +388,7 @@ static void reset() /* * return: how many bytes can be played without blocking */ -static int get_space() +static int get_space(void) { struct timeval tmout; fd_set wfds; @@ -432,7 +432,7 @@ static int get_space() /* * return: delay in seconds between first and last sample in buffer */ -static float get_delay() +static float get_delay(void) { struct timeval now; double buffered_samples_time; diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index 925d78b609..ec856a6671 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -137,19 +137,19 @@ static void uninit(int immed){ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { // for now, just call reset(); reset(); } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { } @@ -158,7 +158,7 @@ void send_lpcm_packet(unsigned char* data,int len,int id,int timestamp,int freq_ extern int vo_pts; // return: how many bytes can be played without blocking -static int get_space(){ +static int get_space(void){ float x=(float)(vo_pts-ao_data.pts)/90000.0; int y; // printf("vo_pts: %5.3f ao_pts: %5.3f\n",vo_pts/90000.0,ao_data.pts/90000.0); @@ -189,7 +189,7 @@ static int play(void* data,int len,int flags){ } // return: delay in seconds between first and last sample in buffer -static float get_delay(){ +static float get_delay(void){ return 0.0; } diff --git a/libao2/ao_nas.c b/libao2/ao_nas.c index f4c74dd7cb..aba055b683 100644 --- a/libao2/ao_nas.c +++ b/libao2/ao_nas.c @@ -506,7 +506,7 @@ static void uninit(int immed){ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ AuStatus as; mp_msg(MSGT_AO, MSGL_DBG3, "ao_nas: reset()\n"); @@ -523,7 +523,7 @@ static void reset(){ } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { AuStatus as; mp_msg(MSGT_AO, MSGL_DBG3, "ao_nas: audio_pause()\n"); @@ -532,7 +532,7 @@ static void audio_pause() } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { AuStatus as; @@ -546,7 +546,7 @@ static void audio_resume() // return: how many bytes can be played without blocking -static int get_space() +static int get_space(void) { int result; @@ -597,7 +597,7 @@ static int play(void* data,int len,int flags) } // return: delay in seconds between first and last sample in buffer -static float get_delay() +static float get_delay(void) { float result; diff --git a/libao2/ao_null.c b/libao2/ao_null.c index 70e3a52b31..7189d98fdf 100644 --- a/libao2/ao_null.c +++ b/libao2/ao_null.c @@ -20,7 +20,7 @@ LIBAO_EXTERN(null) struct timeval last_tv; int buffer; -static void drain(){ +static void drain(void){ struct timeval now_tv; int temp, temp2; @@ -70,24 +70,24 @@ static void uninit(int immed){ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ buffer=0; } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { // for now, just call reset(); reset(); } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { } // return: how many bytes can be played without blocking -static int get_space(){ +static int get_space(void){ drain(); return ao_data.buffersize - buffer; @@ -106,7 +106,7 @@ static int play(void* data,int len,int flags){ } // return: delay in seconds between first and last sample in buffer -static float get_delay(){ +static float get_delay(void){ drain(); return (float) buffer / (float) ao_data.bps; diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index 484f820ecf..b363808463 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -423,7 +423,7 @@ static void uninit(int immed){ } // stop playing and empty buffers (for seeking/pause) -static void reset(){ +static void reset(void){ int oss_format; uninit(1); audio_fd=open(dsp, O_WRONLY); @@ -450,20 +450,20 @@ static void reset(){ } // stop playing, keep buffers (for pause) -static void audio_pause() +static void audio_pause(void) { uninit(1); } // resume playing, after audio_pause() -static void audio_resume() +static void audio_resume(void) { reset(); } // return: how many bytes can be played without blocking -static int get_space(){ +static int get_space(void){ int playsize=ao_data.outburst; #ifdef SNDCTL_DSP_GETOSPACE @@ -503,7 +503,7 @@ static int play(void* data,int len,int flags){ static int audio_delay_method=2; // return: delay in seconds between first and last sample in buffer -static float get_delay(){ +static float get_delay(void){ /* Calculate how many bytes/second is sent out */ if(audio_delay_method==2){ #ifdef SNDCTL_DSP_GETODELAY diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c index 025c3b75ec..f6455bdb89 100644 --- a/libao2/ao_pcm.c +++ b/ |