diff options
author | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-20 22:48:43 +0000 |
---|---|---|
committer | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-20 22:48:43 +0000 |
commit | d4621f881f5a8d327eec9968a1b159b11a3697b4 (patch) | |
tree | 2bfc4b43bc7786a3724a72fda26c8369ec4d732c /libmpdemux/open.c | |
parent | 65800caaaaaf51104c0b5e1584c5ae98e8123cf0 (diff) | |
download | mpv-d4621f881f5a8d327eec9968a1b159b11a3697b4.tar.bz2 mpv-d4621f881f5a8d327eec9968a1b159b11a3697b4.tar.xz |
Changed the order of processing the network opening.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3046 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/open.c')
-rw-r--r-- | libmpdemux/open.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c index 0cbe6a3edf..77980ab7da 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -343,12 +343,16 @@ tv_err: url_free(url); return NULL; } - f=streaming_start( &url, f, *file_format ); -//printf("streaming_start(%d) returned %d\n",*file_format,f); - if(f<0){ mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, url->url); return NULL; } + //if(f<0){ mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, url->url); return NULL; } mp_msg(MSGT_OPEN,MSGL_INFO,MSGTR_ConnToServer, url->hostname ); stream=new_stream(f,STREAMTYPE_STREAM); -// return NULL; + if( streaming_start( stream , url, *file_format )<0){ + mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_UnableOpenURL, filename); + url_free(url); + return NULL; + } + stream_enable_cache(stream,2048*1024); + url_free(url); return stream; } #endif |