diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-07-17 13:14:53 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:14:44 +0200 |
| commit | 578ad534b3d57eac33573e5bf576a819e2ba2303 (patch) | |
| tree | 596e69d3a6cd0ed93fcccf98a8b744423b3ae668 /stream | |
| parent | fea2d4dd45c691f3fd7c79144e63c0d471d37f51 (diff) | |
| download | mpv-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')
| -rw-r--r-- | stream/stream.c | 8 | ||||
| -rw-r--r-- | stream/stream.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/stream/stream.c b/stream/stream.c index d520760867..b562c56cfe 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -91,7 +91,7 @@ static const stream_info_t* const auto_open_streams[] = { #ifdef CONFIG_CDDA &stream_info_cdda, #endif -#ifdef CONFIG_NETWORK +#ifdef CONFIG_NETWORKING &stream_info_netstream, &stream_info_http1, &stream_info_asf, @@ -176,7 +176,7 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo, s->flags |= mode; *ret = sinfo->open(s,mode,arg,file_format); if((*ret) != STREAM_OK) { -#ifdef CONFIG_NETWORK +#ifdef CONFIG_NETWORKING if (*ret == STREAM_REDIRECTED && redirected_url) { if (s->streaming_ctrl && s->streaming_ctrl->url && s->streaming_ctrl->url->url) @@ -270,7 +270,7 @@ int stream_fill_buffer(stream_t *s){ // we will retry even if we already reached EOF previously. switch(s->type){ case STREAMTYPE_STREAM: -#ifdef CONFIG_NETWORK +#ifdef CONFIG_NETWORKING if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_read ) { len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl); } else @@ -341,7 +341,7 @@ if(newpos==0 || newpos!=s->pos){ // Some streaming protocol allow to seek backward and forward // A function call that return -1 can tell that the protocol // doesn't support seeking. -#ifdef CONFIG_NETWORK +#ifdef CONFIG_NETWORKING if(s->seek) { // new stream seek is much cleaner than streaming_ctrl one if(!s->seek(s,newpos)) { mp_msg(MSGT_STREAM,MSGL_ERR, "Seek failed\n"); 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 |