Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions demux/demux_edl.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,12 +560,11 @@ static struct timeline_par *build_timeline(struct timeline *root,
if (!tl->track_layout && !tl->delay_open)
goto error;
if (!root->meta)
root->meta = tl->track_layout;
root->meta = tl->track_layout ? tl->track_layout : root->demuxer;

// Not very sane, since demuxer fields are supposed to be treated read-only
// from outside, but happens to work in this case, so who cares.
if (root->meta)
mp_tags_merge(root->meta->metadata, edl_root->tags);
mp_tags_merge(root->meta->metadata, edl_root->tags);

mp_assert(tl->num_parts == parts->num_parts);
return tl;
Expand Down
1 change: 0 additions & 1 deletion player/lua/ytdl_hook.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ local tag_list = {
["release_year"] = "ytdl_release_year",
["description"] = "ytdl_description",
-- "title" is handled by force-media-title
-- tags don't work with all_formats=yes
}

local safe_protos = Set {
Expand Down
Loading