diff options
| -rw-r--r-- | libmpdemux/aviheader.c | 3 | ||||
| -rw-r--r-- | libmpdemux/demux_avi.c | 17 | ||||
| -rw-r--r-- | libmpdemux/demux_avs.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_gif.c | 3 | ||||
| -rw-r--r-- | libmpdemux/demux_mpg.c | 10 | ||||
| -rw-r--r-- | libmpdemux/demux_ogg.c | 6 | ||||
| -rw-r--r-- | libmpdemux/demux_pva.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 2 | ||||
| -rw-r--r-- | libmpdemux/parse_mp4.c | 3 |
9 files changed, 32 insertions, 16 deletions
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c index 8435fa3c4f..003874bb2e 100644 --- a/libmpdemux/aviheader.c +++ b/libmpdemux/aviheader.c @@ -59,7 +59,8 @@ static int odml_get_vstream_id(int id, unsigned char res[]) return 0; } -int avi_idx_cmp(const void *elem1,const void *elem2) { +static int avi_idx_cmp(const void *elem1, const void *elem2) +{ register off_t a = AVI_IDX_OFFSET((AVIINDEXENTRY *)elem1); register off_t b = AVI_IDX_OFFSET((AVIINDEXENTRY *)elem2); return (a > b) - (b > a); diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index 51a33ca6ae..e3f26d21d3 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -43,7 +43,9 @@ extern const demuxer_desc_t demuxer_desc_avi_nini; int pts_from_bps=1; // Select ds from ID -demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){ +static demux_stream_t *demux_avi_select_stream(demuxer_t *demux, + unsigned int id) +{ int stream_id=avi_stream_id(id); @@ -306,7 +308,8 @@ 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; @@ -374,7 +377,8 @@ 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; @@ -586,7 +590,9 @@ 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; @@ -759,7 +765,8 @@ 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 e52afea4dd..d8bdad6676 100644 --- a/libmpdemux/demux_avs.c +++ b/libmpdemux/demux_avs.c @@ -85,7 +85,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_gif.c b/libmpdemux/demux_gif.c index a85963931a..f18c807626 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -47,7 +47,8 @@ typedef struct { #ifndef CONFIG_GIF_TVT_HACK // not supported by certain versions of the library -int my_read_gif(GifFileType *gif, uint8_t *buf, int len) { +static int my_read_gif(GifFileType *gif, uint8_t *buf, int len) +{ return stream_read(gif->UserData, buf, len); } #endif diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 72ab2a9b27..d37971b44a 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -814,7 +814,8 @@ 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 @@ -901,7 +902,9 @@ do{ 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; @@ -1007,7 +1010,8 @@ 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 3af4866926..d0a462347a 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -177,7 +177,8 @@ extern int dvdsub_id; 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; @@ -513,7 +514,8 @@ 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 835fba2961..39fad12184 100644 --- a/libmpdemux/demux_pva.c +++ b/libmpdemux/demux_pva.c @@ -73,7 +73,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 5d4798470a..d30b11f97e 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -277,7 +277,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/parse_mp4.c b/libmpdemux/parse_mp4.c index bdae91a0fe..767dfc3ff9 100644 --- a/libmpdemux/parse_mp4.c +++ b/libmpdemux/parse_mp4.c @@ -33,7 +33,8 @@ #define MP4_DL MSGL_V #define freereturn(a,b) free(a); return b -int mp4_read_descr_len(stream_t *s) { +static int mp4_read_descr_len(stream_t *s) +{ uint8_t b; uint8_t numBytes = 0; uint32_t length = 0; |