diff options
Diffstat (limited to 'timeline/tl_edl.c')
| -rw-r--r-- | timeline/tl_edl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/timeline/tl_edl.c b/timeline/tl_edl.c index 99b9ddad82..1a54918bcc 100644 --- a/timeline/tl_edl.c +++ b/timeline/tl_edl.c @@ -63,18 +63,18 @@ static int find_edl_source(struct edl_source *sources, int num_sources, void build_edl_timeline(struct MPContext *mpctx) { - const struct bstr file_prefix = BSTR("<"); + const struct bstr file_prefix = bstr("<"); void *tmpmem = talloc_new(NULL); struct bstr *lines = bstr_splitlines(tmpmem, mpctx->demuxer->file_contents); int linec = MP_TALLOC_ELEMS(lines); - struct bstr header = BSTR("mplayer EDL file, version "); + struct bstr header = bstr("mplayer EDL file, version "); if (!linec || !bstr_startswith(lines[0], header)) { mp_msg(MSGT_CPLAYER, MSGL_ERR, "EDL: Bad EDL header!\n"); goto out; } struct bstr version = bstr_strip(bstr_cut(lines[0], header.len)); - if (bstrcmp(BSTR("2"), version)) { + if (bstrcmp(bstr("2"), version)) { mp_msg(MSGT_CPLAYER, MSGL_ERR, "EDL: Unsupported EDL file version!\n"); goto out; } @@ -124,7 +124,7 @@ void build_edl_timeline(struct MPContext *mpctx) goto out; } struct bstr dirname = mp_dirname(mpctx->demuxer->filename); - char *fullname = mp_path_join(tmpmem, dirname, BSTR(filename)); + char *fullname = mp_path_join(tmpmem, dirname, bstr(filename)); edl_ids[num_sources++] = (struct edl_source){id, fullname, i+1}; } @@ -174,7 +174,7 @@ void build_edl_timeline(struct MPContext *mpctx) if (!arg.len) goto bad; int64_t val; - if (!bstrcmp(arg, BSTR("*"))) + if (!bstrcmp(arg, bstr("*"))) val = -1; else if (isdigit(*arg.start)) { val = bstrtoll(arg, &arg, 10) * 1000000000; |