Mercurial > mplayer.hg
changeset 31427:9494acd724a9
Remove duplicate network_bandwidth extern declarations.
| author | diego |
|---|---|
| date | Sun, 20 Jun 2010 16:01:17 +0000 |
| parents | 974cfaa54e83 |
| children | 68c60d07cdbc |
| files | stream/asf_streaming.c stream/http.c stream/pnm.c stream/stream_live555.c stream/stream_nemesi.c stream/stream_rtp.c stream/stream_rtsp.c stream/stream_udp.c |
| diffstat | 8 files changed, 3 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/stream/asf_streaming.c Sun Jun 20 15:53:45 2010 +0000 +++ b/stream/asf_streaming.c Sun Jun 20 16:01:17 2010 +0000 @@ -45,8 +45,6 @@ #include "libmpdemux/asfguid.h" -extern int network_bandwidth; - static int asf_http_streaming_start(stream_t *stream, int *demuxer_type); static int asf_read_wrapper(int fd, void *buffer, int len, streaming_ctrl_t *stream_ctrl) {
--- a/stream/http.c Sun Jun 20 15:53:45 2010 +0000 +++ b/stream/http.c Sun Jun 20 16:01:17 2010 +0000 @@ -45,7 +45,6 @@ extern const mime_struct_t mime_type_table[]; extern int stream_cache_size; -extern int network_bandwidth; typedef struct { unsigned metaint;
--- a/stream/pnm.c Sun Jun 20 15:53:45 2010 +0000 +++ b/stream/pnm.c Sun Jun 20 16:01:17 2010 +0000 @@ -54,8 +54,6 @@ #include "tcp.h" //#include "libreal/rmff.h" -extern int network_bandwidth; - #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ (((long)(unsigned char)(ch3) ) | \ ( (long)(unsigned char)(ch2) << 8 ) | \
--- a/stream/stream_live555.c Sun Jun 20 15:53:45 2010 +0000 +++ b/stream/stream_live555.c Sun Jun 20 16:01:17 2010 +0000 @@ -28,8 +28,6 @@ #include "libmpdemux/demuxer.h" #include "help_mp.h" -extern int network_bandwidth; - static int _rtsp_streaming_seek(int fd, off_t pos, streaming_ctrl_t* streaming_ctrl) { return -1; // For now, we don't handle RTSP stream seeking }
--- a/stream/stream_nemesi.c Sun Jun 20 15:53:45 2010 +0000 +++ b/stream/stream_nemesi.c Sun Jun 20 16:01:17 2010 +0000 @@ -32,12 +32,12 @@ #include <errno.h> +#include "network.h" #include "stream.h" #include "libmpdemux/demuxer.h" #include "tcp.h" -extern int network_bandwidth; char *rtsp_destination = NULL; static int rtsp_streaming_seek(int fd, off_t pos,
--- a/stream/stream_rtp.c Sun Jun 20 15:53:45 2010 +0000 +++ b/stream/stream_rtp.c Sun Jun 20 16:01:17 2010 +0000 @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> +#include "network.h" #include "stream.h" #include "url.h" #include "udp.h" @@ -70,7 +71,6 @@ rtp_stream_open (stream_t *stream, int mode, void *opts, int *file_format) { URL_t *url; - extern int network_bandwidth; mp_msg (MSGT_OPEN, MSGL_INFO, "STREAM_RTP, URL: %s\n", stream->url); stream->streaming_ctrl = streaming_ctrl_new ();
--- a/stream/stream_rtsp.c Sun Jun 20 15:53:45 2010 +0000 +++ b/stream/stream_rtsp.c Sun Jun 20 16:01:17 2010 +0000 @@ -46,8 +46,6 @@ #define RTSP_DEFAULT_PORT 554 -extern int network_bandwidth; - static int rtsp_streaming_read (int fd, char *buffer, int size, streaming_ctrl_t *stream_ctrl)
--- a/stream/stream_udp.c Sun Jun 20 15:53:45 2010 +0000 +++ b/stream/stream_udp.c Sun Jun 20 16:01:17 2010 +0000 @@ -25,6 +25,7 @@ #include <stdlib.h> #include <string.h> +#include "network.h" #include "stream.h" #include "url.h" #include "udp.h" @@ -62,7 +63,6 @@ udp_stream_open (stream_t *stream, int mode, void *opts, int *file_format) { URL_t *url; - extern int network_bandwidth; mp_msg (MSGT_OPEN, MSGL_INFO, "STREAM_UDP, URL: %s\n", stream->url); stream->streaming_ctrl = streaming_ctrl_new ();