summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorPhilip Sequeira <phsequei@gmail.com>2019-03-02 18:14:57 -0500
committersfan5 <sfan5@live.de>2019-03-03 13:13:45 +0100
commit89eacf8131827533c956a9a10ec1519d2ebdcc31 (patch)
tree2ec9b6e525a2548ea247436af62164d8e9ee5a1f /demux
parentb9cde8d95c0a6cc19a93ed3a2971a12b012dd9b5 (diff)
downloadmpv-89eacf8131827533c956a9a10ec1519d2ebdcc31.tar.bz2
mpv-89eacf8131827533c956a9a10ec1519d2ebdcc31.tar.xz
demux_edl: don't assume data follows a comment line
There could be another comment line or the end of the file. Fixes #6529.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_edl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index b724ffa592..7f85568eae 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -80,8 +80,10 @@ static struct tl_parts *parse_edl(bstr str)
{
struct tl_parts *tl = talloc_zero(NULL, struct tl_parts);
while (str.len) {
- if (bstr_eatstart0(&str, "#"))
+ if (bstr_eatstart0(&str, "#")) {
bstr_split_tok(str, "\n", &(bstr){0}, &str);
+ continue;
+ }
if (bstr_eatstart0(&str, "\n") || bstr_eatstart0(&str, ";"))
continue;
bool is_header = bstr_eatstart0(&str, "!");