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/open.c | |
| 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/open.c')
| -rw-r--r-- | libmpdemux/open.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; |