summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-01-25 10:04:05 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-01-25 10:04:05 +0000
commit42d3010880f8df5965b715bb31a471357b4ac2b6 (patch)
tree772e8c7455ba104053ca42efb316bfe819b28932 /mplayer.c
parent8e2ccdff36356c7705f20b142f0776f69639c0ea (diff)
downloadmpv-42d3010880f8df5965b715bb31a471357b4ac2b6.tar.bz2
mpv-42d3010880f8df5965b715bb31a471357b4ac2b6.tar.xz
- fix -fs
- set sub_fps to null for new files - fix one sig11, if you play vcd, and the disc is not vcd, playtree is dead - add playbar vertical position support - etc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9089 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/mplayer.c b/mplayer.c
index d7dd2b9a12..d7a6337bd3 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1275,6 +1275,7 @@ if(!demuxer)
play_tree_t* entry;
// Handle playlist
current_module="handle_playlist";
+ if ( stream->type != STREAMTYPE_PLAYLIST ) goto goto_next_file;
mp_msg(MSGT_CPLAYER,MSGL_INFO,"Falling back on trying to parse playlist %s...\n",filename);
stream_reset(stream);
stream_seek(stream,stream->start_pos);