diff options
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_asf.c | 6 | ||||
-rw-r--r-- | libmpdemux/demux_audio.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_avi.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_lavf.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_mpg.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ogg.c | 8 | ||||
-rw-r--r-- | libmpdemux/demux_real.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_realaud.c | 2 | ||||
-rw-r--r-- | libmpdemux/demux_ts.c | 4 | ||||
-rw-r--r-- | libmpdemux/demux_ty.c | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 4 | ||||
-rw-r--r-- | libmpdemux/demuxer.h | 16 | ||||
-rw-r--r-- | libmpdemux/muxer_mpeg.c | 2 |
13 files changed, 29 insertions, 29 deletions
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 7d8bd82a1a..8a20415530 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -18,8 +18,8 @@ // defined at asfheader.c: -extern int asf_check_header(demuxer_t *demuxer); -extern int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf); +int asf_check_header(demuxer_t *demuxer); +int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf); // based on asf file-format doc by Eugene [http://divx.euro.ru] @@ -531,7 +531,7 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ #include "stheader.h" -extern void skip_audio_frame(sh_audio_t *sh_audio); +void skip_audio_frame(sh_audio_t *sh_audio); static void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags){ struct asf_priv* asf = demuxer->priv; diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index f75a4d6da6..53a41c1401 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -45,7 +45,7 @@ typedef struct mp3_hdr { struct mp3_hdr *next; } mp3_hdr_t; -extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); +void print_wave_header(WAVEFORMATEX *h, int verbose_level); int hr_mp3_seek = 0; diff --git a/libmpdemux/demux_avi.c b/libmpdemux/demux_avi.c index ea0774c553..765463168d 100644 --- a/libmpdemux/demux_avi.c +++ b/libmpdemux/demux_avi.c @@ -14,8 +14,8 @@ #include "aviheader.h" -extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); -extern int demux_ogg_open(demuxer_t* demuxer); +demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); +int demux_ogg_open(demuxer_t* demuxer); extern const demuxer_desc_t demuxer_desc_avi_ni; extern const demuxer_desc_t demuxer_desc_avi_nini; diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 0e33e38d1c..1179369847 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -77,8 +77,8 @@ typedef struct lavf_priv_t{ int cur_program; }lavf_priv_t; -extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); -extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level); +void print_wave_header(WAVEFORMATEX *h, int verbose_level); +void print_video_header(BITMAPINFOHEADER *h, int verbose_level); static int mp_read(void *opaque, uint8_t *buf, int size) { stream_t *stream = opaque; diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index 74c35ebcf7..489821f878 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -879,7 +879,7 @@ do{ return 1; } -extern void skip_audio_frame(sh_audio_t *sh_audio); +void skip_audio_frame(sh_audio_t *sh_audio); static void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,float audio_delay, int flags){ demux_stream_t *d_audio=demuxer->audio; diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c index 3a096cc5a0..013bff5a76 100644 --- a/libmpdemux/demux_ogg.c +++ b/libmpdemux/demux_ogg.c @@ -30,7 +30,7 @@ #ifdef CONFIG_OGGTHEORA #include <theora/theora.h> -extern int _ilog (unsigned int); /* defined in many places in theora/lib/ */ +int _ilog (unsigned int); /* defined in many places in theora/lib/ */ #endif #define BLOCK_SIZE 4096 @@ -607,11 +607,11 @@ static void demux_ogg_scan_stream(demuxer_t* demuxer) { } -extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); -extern void print_video_header(BITMAPINFOHEADER *h, int verbose_level); +void print_wave_header(WAVEFORMATEX *h, int verbose_level); +void print_video_header(BITMAPINFOHEADER *h, int verbose_level); /* defined in demux_mov.c */ -extern unsigned int store_ughvlc(unsigned char *s, unsigned int v); +unsigned int store_ughvlc(unsigned char *s, unsigned int v); /** \brief Change the current subtitle stream and return its ID. diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 88e6574d6e..b6b54f7c03 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -1085,7 +1085,7 @@ discard: return 0; } -extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); +void print_wave_header(WAVEFORMATEX *h, int verbose_level); static demuxer_t* demux_open_real(demuxer_t* demuxer) { diff --git a/libmpdemux/demux_realaud.c b/libmpdemux/demux_realaud.c index eedaf1e135..57226fa2d3 100644 --- a/libmpdemux/demux_realaud.c +++ b/libmpdemux/demux_realaud.c @@ -141,7 +141,7 @@ static int demux_ra_fill_buffer(demuxer_t *demuxer, demux_stream_t *dsds) -extern void print_wave_header(WAVEFORMATEX *h, int verbose_level); +void print_wave_header(WAVEFORMATEX *h, int verbose_level); diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index d6202a223f..c0924d9ecf 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -1107,7 +1107,7 @@ static void demux_close_ts(demuxer_t * demuxer) } -extern unsigned char mp_getbits(unsigned char*, unsigned int, unsigned char); +unsigned char mp_getbits(unsigned char*, unsigned int, unsigned char); #define getbits mp_getbits static int mp4_parse_sl_packet(pmt_t *pmt, uint8_t *buf, uint16_t packet_len, int pid, ES_stream_t *pes_es) @@ -3085,7 +3085,7 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, } -extern void skip_audio_frame(sh_audio_t *sh_audio); +void skip_audio_frame(sh_audio_t *sh_audio); static void reset_fifos(demuxer_t *demuxer, int a, int v, int s) { diff --git a/libmpdemux/demux_ty.c b/libmpdemux/demux_ty.c index b63590daab..2b51fb6006 100644 --- a/libmpdemux/demux_ty.c +++ b/libmpdemux/demux_ty.c @@ -47,7 +47,7 @@ #include "libavutil/avstring.h" #include "libavutil/intreadwrite.h" -extern void skip_audio_frame( sh_audio_t *sh_audio ); +void skip_audio_frame( sh_audio_t *sh_audio ); extern int sub_justify; // 2/c0: audio data diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 87c2429402..6c3792b1d9 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -35,8 +35,8 @@ #endif #endif -extern void resync_video_stream(sh_video_t *sh_video); -extern void resync_audio_stream(sh_audio_t *sh_audio); +void resync_video_stream(sh_video_t *sh_video); +void resync_audio_stream(sh_audio_t *sh_audio); // Demuxer list extern const demuxer_desc_t demuxer_desc_rawaudio; diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 993c30b904..e8b62a1004 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -397,16 +397,16 @@ int demux_ogg_num_subs(demuxer_t *demuxer); int demux_ogg_sub_id(demuxer_t *demuxer, int index); #endif -extern int demuxer_get_current_time(demuxer_t *demuxer); -extern double demuxer_get_time_length(demuxer_t *demuxer); -extern int demuxer_get_percent_pos(demuxer_t *demuxer); -extern int demuxer_switch_audio(demuxer_t *demuxer, int index); -extern int demuxer_switch_video(demuxer_t *demuxer, int index); +int demuxer_get_current_time(demuxer_t *demuxer); +double demuxer_get_time_length(demuxer_t *demuxer); +int demuxer_get_percent_pos(demuxer_t *demuxer); +int demuxer_switch_audio(demuxer_t *demuxer, int index); +int demuxer_switch_video(demuxer_t *demuxer, int index); -extern int demuxer_type_by_filename(char* filename); +int demuxer_type_by_filename(char* filename); -extern void demuxer_help(void); -extern int get_demuxer_type_from_name(char *demuxer_name, int *force); +void demuxer_help(void); +int get_demuxer_type_from_name(char *demuxer_name, int *force); int demuxer_add_attachment(demuxer_t* demuxer, const char* name, const char* type, const void* data, size_t size); diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c index d2f67e2a54..7e88686483 100644 --- a/libmpdemux/muxer_mpeg.c +++ b/libmpdemux/muxer_mpeg.c @@ -2048,7 +2048,7 @@ static int analyze_mpa(muxer_stream_t *s) return layer; //actual layer with the highest score } -extern int aac_parse_frame(uint8_t *buf, int *srate, int *num); +int aac_parse_frame(uint8_t *buf, int *srate, int *num); static int parse_audio(muxer_stream_t *s, int finalize, unsigned int *nf, double *timer, double delay, int drop) { |