diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-26 00:58:15 +0200 |
commit | dd888b05ff3af1c6c35582e75bedae687d38fc66 (patch) | |
tree | 7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /playtreeparser.c | |
parent | 0406d951209df261970424256d76f293649ec140 (diff) | |
parent | 85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff) | |
download | mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2 mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz |
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg.
Conflicts:
Makefile
configure
mplayer.c
Diffstat (limited to 'playtreeparser.c')
-rw-r--r-- | playtreeparser.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/playtreeparser.c b/playtreeparser.c index 9e83cb4161..9d34cc737b 100644 --- a/playtreeparser.c +++ b/playtreeparser.c @@ -453,6 +453,8 @@ parse_smil(play_tree_parser_t* p) { continue; if (strncasecmp(line,"<?xml",5)==0) // smil in xml continue; + if (strncasecmp(line,"<!DOCTYPE smil",13)==0) // smil in xml + continue; if (strncasecmp(line,"<smil",5)==0 || strncasecmp(line,"<?wpl",5)==0 || strncasecmp(line,"(smil-document",14)==0) break; // smil header found |