From 578ad534b3d57eac33573e5bf576a819e2ba2303 Mon Sep 17 00:00:00 2001 From: diego Date: Sat, 17 Jul 2010 13:14:53 +0000 Subject: 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 --- stream/stream.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stream/stream.h') 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 -- cgit v1.2.3