summaryrefslogtreecommitdiffstats
path: root/libmpdemux
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 /libmpdemux
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 'libmpdemux')
-rw-r--r--libmpdemux/asfheader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 50a83b75d9..b1058ae011 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -661,7 +661,7 @@ if(streams) {
// as the servers often do not care about what we requested.
#if 0
uint32_t vr = 0, ar = 0,i;
-#ifdef CONFIG_NETWORK
+#ifdef CONFIG_NETWORKING
if( demuxer->stream->streaming_ctrl!=NULL ) {
if( demuxer->stream->streaming_ctrl->bandwidth!=0 && demuxer->stream->streaming_ctrl->data!=NULL ) {
best_audio = ((asf_http_streaming_ctrl_t*)demuxer->stream->streaming_ctrl->data)->audio_id;