diff options
Diffstat (limited to 'mpvcore')
| -rw-r--r-- | mpvcore/player/mp_core.h | 2 | ||||
| -rw-r--r-- | mpvcore/player/timeline/tl_mpv_edl.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mpvcore/player/mp_core.h b/mpvcore/player/mp_core.h index 2ea65f54be..4e15f49c49 100644 --- a/mpvcore/player/mp_core.h +++ b/mpvcore/player/mp_core.h @@ -428,8 +428,6 @@ void update_subtitles(struct MPContext *mpctx); void build_ordered_chapter_timeline(struct MPContext *mpctx); // timeline/tl_mpv_edl.c void build_mpv_edl_timeline(struct MPContext *mpctx); -// timeline/tl_edl.c -void build_edl_timeline(struct MPContext *mpctx); // timeline/tl_cue.c void build_cue_timeline(struct MPContext *mpctx); diff --git a/mpvcore/player/timeline/tl_mpv_edl.c b/mpvcore/player/timeline/tl_mpv_edl.c index 1f4bbc268e..fc0b6ebeeb 100644 --- a/mpvcore/player/timeline/tl_mpv_edl.c +++ b/mpvcore/player/timeline/tl_mpv_edl.c @@ -56,16 +56,14 @@ static bool parse_time(bstr str, double *out_time) } /* Returns a list of parts, or NULL on parse error. - * Syntax: - * url ::= ['edl://'|'mpv EDL v0\n'] <entry> ( (';' | '\n') <entry> )* + * Syntax (without file header or URI prefix): + * url ::= <entry> ( (';' | '\n') <entry> )* * entry ::= <param> ( <param> ',' )* * param ::= [<string> '='] (<string> | '%' <number> '%' <bytes>) */ static struct tl_parts *parse_edl(bstr str) { struct tl_parts *tl = talloc_zero(NULL, struct tl_parts); - if (!bstr_eatstart0(&str, "edl://")) - bstr_eatstart0(&str, "mpv EDL v0\n"); while (str.len) { if (bstr_eatstart0(&str, "#")) bstr_split_tok(str, "\n", &(bstr){0}, &str); |