aboutsummaryrefslogtreecommitdiffhomepage
path: root/stream
diff options
context:
space:
mode:
authorGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 23:01:03 +0000
committerGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-12-03 23:01:03 +0000
commit0864f92e7a55b20a21fc2f5eaf9e72cb799a6f7d (patch)
treeacd33d7cbfa6a967626858375daa802c652dfe3f /stream
parentd7a5babef76ba9324f303535745af21461bdcc84 (diff)
Get rid of pointless 'extern' keywords.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/cache2.h2
-rw-r--r--stream/cookies.h4
-rw-r--r--stream/dvbin.h8
-rw-r--r--stream/http.c2
-rw-r--r--stream/stream_cdda.c6
-rw-r--r--stream/stream_dvb.c8
6 files changed, 15 insertions, 15 deletions
diff --git a/stream/cache2.h b/stream/cache2.h
index 4eb201e177..8403c05aff 100644
--- a/stream/cache2.h
+++ b/stream/cache2.h
@@ -3,7 +3,7 @@
#include "stream.h"
-extern void cache_uninit(stream_t *s);
+void cache_uninit(stream_t *s);
int cache_do_control(stream_t *stream, int cmd, void *arg);
#endif /* MPLAYER_CACHE2_H */
diff --git a/stream/cookies.h b/stream/cookies.h
index f1619110ce..f4c2a0525e 100644
--- a/stream/cookies.h
+++ b/stream/cookies.h
@@ -10,7 +10,7 @@
#include "http.h"
-extern void cookies_set(HTTP_header_t * http_hdr, const char *hostname,
- const char *url);
+void cookies_set(HTTP_header_t * http_hdr, const char *hostname,
+ const char *url);
#endif /* MPLAYER_COOKIES_H */
diff --git a/stream/dvbin.h b/stream/dvbin.h
index 172cd1299d..84c9d2c625 100644
--- a/stream/dvbin.h
+++ b/stream/dvbin.h
@@ -108,9 +108,9 @@ typedef struct {
#define TUNER_CBL 3
#define TUNER_ATSC 4
-extern int dvb_step_channel(stream_t *, int);
-extern int dvb_set_channel(stream_t *, int, int);
-extern dvb_config_t *dvb_get_config(void);
-extern void dvb_free_config(dvb_config_t *config);
+int dvb_step_channel(stream_t *, int);
+int dvb_set_channel(stream_t *, int, int);
+dvb_config_t *dvb_get_config(void);
+void dvb_free_config(dvb_config_t *config);
#endif /* MPLAYER_DVBIN_H */
diff --git a/stream/http.c b/stream/http.c
index fa8b4e9d35..67b719269f 100644
--- a/stream/http.c
+++ b/stream/http.c
@@ -31,7 +31,7 @@ extern const mime_struct_t mime_type_table[];
extern int stream_cache_size;
extern int network_bandwidth;
-extern int http_seek(stream_t *stream, off_t pos);
+int http_seek(stream_t *stream, off_t pos);
typedef struct {
unsigned metaint;
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index fb6f2e9358..a7555dc7b4 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -88,9 +88,9 @@ const m_option_t cdda_opts[] = {
{NULL, NULL, 0, 0, 0, 0, NULL}
};
-extern int cdd_identify(const char *dev);
-extern int cddb_resolve(const char *dev, char **xmcd_file);
-extern cd_info_t* cddb_parse_xmcd(char *xmcd_file);
+int cdd_identify(const char *dev);
+int cddb_resolve(const char *dev, char **xmcd_file);
+cd_info_t* cddb_parse_xmcd(char *xmcd_file);
static int seek(stream_t* s,off_t pos);
static int fill_buffer(stream_t* s, char* buffer, int max_len);
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 78bc8a9309..d2c5b4b06e 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -105,13 +105,13 @@ const m_option_t dvbin_opts_conf[] = {
-extern int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype);
-extern int dvb_demux_stop(int fd);
-extern int dvb_get_tuner_type(int fd);
+int dvb_set_ts_filt(int fd, uint16_t pid, dmx_pes_type_t pestype);
+int dvb_demux_stop(int fd);
+int dvb_get_tuner_type(int fd);
int dvb_open_devices(dvb_priv_t *priv, int n, int demux_cnt);
int dvb_fix_demuxes(dvb_priv_t *priv, int cnt);
-extern int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone,
+int dvb_tune(dvb_priv_t *priv, int freq, char pol, int srate, int diseqc, int tone,
fe_spectral_inversion_t specInv, fe_modulation_t modulation, fe_guard_interval_t guardInterval,
fe_transmit_mode_t TransmissionMode, fe_bandwidth_t bandWidth, fe_code_rate_t HP_CodeRate,
fe_code_rate_t LP_CodeRate, fe_hierarchy_t hier, int timeout);