diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-30 17:10:36 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-03-30 17:10:36 +0000 |
| commit | c5c742302c5556624940964d319b7b7b88499825 (patch) | |
| tree | 1c61a82302574852893d9e72d2dd7a29040daf6f /libmpdemux/network.c | |
| parent | 2f0fdb59c0bcc7d9b7b550b19d418ae714dc7144 (diff) | |
| download | mpv-c5c742302c5556624940964d319b7b7b88499825.tar.bz2 mpv-c5c742302c5556624940964d319b7b7b88499825.tar.xz | |
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/network.c')
| -rw-r--r-- | libmpdemux/network.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmpdemux/network.c b/libmpdemux/network.c index 696a746491..ed80d65a98 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -18,7 +18,7 @@ #include "stream.h" #include "demuxer.h" -#include "../cfgparser.h" +#include "../m_config.h" #include "network.h" #include "http.h" @@ -36,7 +36,7 @@ extern int stream_cache_size; extern int mp_input_check_interrupt(int time); -int asf_streaming_start( stream_t *stream ); +int asf_streaming_start( stream_t *stream, int *demuxer_type ); int rtsp_streaming_start( stream_t *stream ); /* Variables for the command line option -user, -passwd & -bandwidth */ @@ -1006,7 +1006,9 @@ streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) { // Send the appropriate HTTP request // Need to filter the network stream. // ASF raw stream is encapsulated. - ret = asf_streaming_start( stream ); + // It can also be a playlist (redirector) + // so we need to pass demuxer_type too + ret = asf_streaming_start( stream, demuxer_type ); if( ret<0 ) { mp_msg(MSGT_NETWORK,MSGL_ERR,"asf_streaming_start failed\n"); } @@ -1040,8 +1042,6 @@ streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) { if( ret<0 ) { mp_msg(MSGT_NETWORK,MSGL_ERR,"nop_streaming_start failed\n"); } - if((*demuxer_type) == DEMUXER_TYPE_PLAYLIST) - stream->type = STREAMTYPE_PLAYLIST; break; default: mp_msg(MSGT_NETWORK,MSGL_ERR,"Unable to detect the streaming type\n"); |