summaryrefslogtreecommitdiffstats
path: root/stream/stream.h
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-07-17 13:14:53 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:14:44 +0200
commit578ad534b3d57eac33573e5bf576a819e2ba2303 (patch)
tree596e69d3a6cd0ed93fcccf98a8b744423b3ae668 /stream/stream.h
parentfea2d4dd45c691f3fd7c79144e63c0d471d37f51 (diff)
downloadmpv-578ad534b3d57eac33573e5bf576a819e2ba2303.tar.bz2
mpv-578ad534b3d57eac33573e5bf576a819e2ba2303.tar.xz
configure: Rename "network" variable and option to "networking"
This avoids conflicts with the FFmpeg variable of the same name. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31749 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream.h')
-rw-r--r--stream/stream.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/stream.h b/stream/stream.h
index 7380b59bb3..ee78e1c196 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -163,13 +163,13 @@ typedef struct stream {
char* url; // strdup() of filename/url
char *lavf_type; // name of expected demuxer type for lavf
struct MPOpts *opts;
-#ifdef CONFIG_NETWORK
+#ifdef CONFIG_NETWORKING
streaming_ctrl_t *streaming_ctrl;
#endif
unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE];
} stream_t;
-#ifdef CONFIG_NETWORK
+#ifdef CONFIG_NETWORKING
#include "network.h"
#endif