[MPlayer-cvslog] r31493 - in trunk/stream: asf_streaming.c http.c pnm.c stream_live555.c stream_nemesi.c stream_rtp.c stream_rtsp.c stream_udp.c

[diego]

Author: diego
Date: Sun Jun 20 18:01:17 2010
New Revision: 31493

Log:
Remove duplicate network_bandwidth extern declarations.

Modified:
   trunk/stream/asf_streaming.c
   trunk/stream/http.c
   trunk/stream/pnm.c
   trunk/stream/stream_live555.c
   trunk/stream/stream_nemesi.c
   trunk/stream/stream_rtp.c
   trunk/stream/stream_rtsp.c
   trunk/stream/stream_udp.c

Modified: trunk/stream/asf_streaming.c
==============================================================================
--- trunk/stream/asf_streaming.c	Sun Jun 20 17:53:45 2010	(r31492)
+++ trunk/stream/asf_streaming.c	Sun Jun 20 18:01:17 2010	(r31493)
@@ -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) {

Modified: trunk/stream/http.c
==============================================================================
--- trunk/stream/http.c	Sun Jun 20 17:53:45 2010	(r31492)
+++ trunk/stream/http.c	Sun Jun 20 18:01:17 2010	(r31493)
@@ -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;

Modified: trunk/stream/pnm.c
==============================================================================
--- trunk/stream/pnm.c	Sun Jun 20 17:53:45 2010	(r31492)
+++ trunk/stream/pnm.c	Sun Jun 20 18:01:17 2010	(r31493)
@@ -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  ) | \

Modified: trunk/stream/stream_live555.c
==============================================================================
--- trunk/stream/stream_live555.c	Sun Jun 20 17:53:45 2010	(r31492)
+++ trunk/stream/stream_live555.c	Sun Jun 20 18:01:17 2010	(r31493)
@@ -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
 }

Modified: trunk/stream/stream_nemesi.c
==============================================================================
--- trunk/stream/stream_nemesi.c	Sun Jun 20 17:53:45 2010	(r31492)
+++ trunk/stream/stream_nemesi.c	Sun Jun 20 18:01:17 2010	(r31493)
@@ -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,

Modified: trunk/stream/stream_rtp.c
==============================================================================
--- trunk/stream/stream_rtp.c	Sun Jun 20 17:53:45 2010	(r31492)
+++ trunk/stream/stream_rtp.c	Sun Jun 20 18:01:17 2010	(r31493)
@@ -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 @@ static int
 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 ();

Modified: trunk/stream/stream_rtsp.c
==============================================================================
--- trunk/stream/stream_rtsp.c	Sun Jun 20 17:53:45 2010	(r31492)
+++ trunk/stream/stream_rtsp.c	Sun Jun 20 18:01:17 2010	(r31493)
@@ -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)

Modified: trunk/stream/stream_udp.c
==============================================================================
--- trunk/stream/stream_udp.c	Sun Jun 20 17:53:45 2010	(r31492)
+++ trunk/stream/stream_udp.c	Sun Jun 20 18:01:17 2010	(r31493)
@@ -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 @@ static int
 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 ();