diff options
author | 2003-03-30 17:10:36 +0000 | |
---|---|---|
committer | 2003-03-30 17:10:36 +0000 | |
commit | c5c742302c5556624940964d319b7b7b88499825 (patch) | |
tree | 1c61a82302574852893d9e72d2dd7a29040daf6f /libmpdemux/asf_streaming.c | |
parent | 2f0fdb59c0bcc7d9b7b550b19d418ae714dc7144 (diff) |
Use new config headers
Remove STREAMTYPE_PLAYLIST.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9750 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/asf_streaming.c')
-rw-r--r-- | libmpdemux/asf_streaming.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libmpdemux/asf_streaming.c b/libmpdemux/asf_streaming.c index 569447f556..0e3eaf8cdb 100644 --- a/libmpdemux/asf_streaming.c +++ b/libmpdemux/asf_streaming.c @@ -11,6 +11,7 @@ #include "asf.h" #include "stream.h" +#include "demuxer.h" #include "network.h" @@ -24,7 +25,7 @@ extern int verbose; -int asf_http_streaming_start( stream_t *stream ); +int asf_http_streaming_start( stream_t *stream, int *demuxer_type ); int asf_mmst_streaming_start( stream_t *stream ); @@ -47,7 +48,7 @@ int asf_mmst_streaming_start( stream_t *stream ); // In MPlayer case since HTTP support is more reliable, // we are doing HTTP first then we try MMST if HTTP fail. int -asf_streaming_start( stream_t *stream ) { +asf_streaming_start( stream_t *stream, int *demuxer_type) { char proto_s[10]; int fd = -1; @@ -58,7 +59,7 @@ asf_streaming_start( stream_t *stream ) { !strncasecmp( proto_s, "http_proxy", 10) ) { mp_msg(MSGT_NETWORK,MSGL_V,"Trying ASF/HTTP...\n"); - fd = asf_http_streaming_start( stream ); + fd = asf_http_streaming_start( stream, demuxer_type ); if( fd>-1 ) return fd; mp_msg(MSGT_NETWORK,MSGL_V," ===> ASF/HTTP failed\n"); if( fd==-2 ) return -1; @@ -619,7 +620,7 @@ asf_http_parse_response(asf_http_streaming_ctrl_t *asf_http_ctrl, HTTP_header_t } int -asf_http_streaming_start( stream_t *stream ) { +asf_http_streaming_start( stream_t *stream, int *demuxer_type ) { HTTP_header_t *http_hdr=NULL; URL_t *url = stream->streaming_ctrl->url; asf_http_streaming_ctrl_t *asf_http_ctrl; @@ -717,7 +718,7 @@ asf_http_streaming_start( stream_t *stream ) { return -1; } } - stream->type = STREAMTYPE_PLAYLIST; + *demuxer_type = DEMUXER_TYPE_PLAYLIST; done = 1; break; case ASF_Authenticate_e: |