History

Revert "demux_edl: disallow nested edl to avoid infinite loop"

Apparently there are some scripts that use nested edls instead of flattening them first, so let's live with this. This reverts commit de42e11662f3f002033b28876b6a03e0313ba8a9.

Kacper Michajłow committed 1 year ago

Commit 497310a1 parent 96da0cb2 files · +0 −5Browse files

Unified · Split

2 files
  1. DOCS/interface-changes/edl.txt +0 −1
  2. demux/demux_edl.c +0 −4
DOCS/interface-changes/edl.txt+0−1
@@ -1 +0,0 @@
1nested edl are no longer supported; flatten the edl or use a playlist with multiple edl entries
demux/demux_edl.c+0−4
@@ -451,10 +451,6 @@ static struct timeline_par *build_timeline(struct timeline *root, · 450 unmodified lines
451 struct tl_part *part = &parts->parts[n];451 struct tl_part *part = &parts->parts[n];
452 struct demuxer *source = NULL;452 struct demuxer *source = NULL;
453 453
454 if (!bstrcasecmp0(mp_split_proto(bstr0(part->filename), NULL), "edl")) {
455 MP_ERR(root, "Nested EDL is not allowed.\n");
456 goto error;
457 }
458 if (tl->dash) {454 if (tl->dash) {
459 part->offset = starttime;455 part->offset = starttime;
460 if (part->length <= 0)456 if (part->length <= 0)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t