diff options
| author | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-17 16:46:41 +0000 |
|---|---|---|
| committer | rtognimp <rtognimp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-17 16:46:41 +0000 |
| commit | e3daf3ca75f6a596ec6b6e5b08b73389407a58d2 (patch) | |
| tree | 95ae172c6716a1fe35ce98219547a3fa8216ba8c /libmpdemux | |
| parent | 83744e1bca75219173170bd6323597aa775625e6 (diff) | |
| download | mpv-e3daf3ca75f6a596ec6b6e5b08b73389407a58d2.tar.bz2 mpv-e3daf3ca75f6a596ec6b6e5b08b73389407a58d2.tar.xz | |
Respect -playlist for asx streams
Patch by adland
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12224 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demuxer.c | 2 | ||||
| -rw-r--r-- | libmpdemux/network.c | 6 | ||||
| -rw-r--r-- | libmpdemux/open.c | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 7d69dbb6d8..8950e2ed1d 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -1377,7 +1377,7 @@ extern int hr_mp3_seek; demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ stream_t *as = NULL,*ss = NULL; demuxer_t *vd,*ad = NULL,*sd = NULL; - int afmt = 0,sfmt = 0; + int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ; if(audio_stream) { as = open_stream(audio_stream,0,&afmt); diff --git a/libmpdemux/network.c b/libmpdemux/network.c index 4b41876b5d..731b0d098f 100644 --- a/libmpdemux/network.c +++ b/libmpdemux/network.c @@ -1168,7 +1168,13 @@ streaming_start(stream_t *stream, int *demuxer_type, URL_t *url) { return -1; } stream->streaming_ctrl->url = check4proxies( url ); + + if (*demuxer_type != DEMUXER_TYPE_PLAYLIST){ ret = autodetectProtocol( stream->streaming_ctrl, &stream->fd, demuxer_type ); + } else { + ret=0; + } + if( ret<0 ) { return -1; } diff --git a/libmpdemux/open.c b/libmpdemux/open.c index 859713a752..65719223b0 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -115,7 +115,12 @@ stream_t* open_stream(char* filename,char** options, int* file_format){ stream_t* stream=NULL; int f=-1; off_t len; -*file_format = DEMUXER_TYPE_UNKNOWN; + + // Check if playlist or unknown + if (*file_format != DEMUXER_TYPE_PLAYLIST){ + *file_format=DEMUXER_TYPE_UNKNOWN; + } + if(!filename) { mp_msg(MSGT_OPEN,MSGL_ERR,"NULL filename, report this bug\n"); return NULL; |