From 497310a23538150462f393fca7a8f35dde4e29ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Sat, 4 Jan 2025 15:03:14 +0100 Subject: [PATCH] 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. --- DOCS/interface-changes/edl.txt | 1 - demux/demux_edl.c | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 DOCS/interface-changes/edl.txt diff --git a/DOCS/interface-changes/edl.txt b/DOCS/interface-changes/edl.txt deleted file mode 100644 index 1264f567b6..0000000000 --- a/DOCS/interface-changes/edl.txt +++ /dev/null @@ -1 +0,0 @@ -nested edl are no longer supported; flatten the edl or use a playlist with multiple edl entries diff --git a/demux/demux_edl.c b/demux/demux_edl.c index 7f7dde2c84..96f76c9066 100644 --- a/demux/demux_edl.c +++ b/demux/demux_edl.c @@ -451,10 +451,6 @@ static struct timeline_par *build_timeline(struct timeline *root, struct tl_part *part = &parts->parts[n]; struct demuxer *source = NULL; - if (!bstrcasecmp0(mp_split_proto(bstr0(part->filename), NULL), "edl")) { - MP_ERR(root, "Nested EDL is not allowed.\n"); - goto error; - } if (tl->dash) { part->offset = starttime; if (part->length <= 0)