summaryrefslogtreecommitdiffstats
path: root/sub/sd_ass.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-02-15 02:19:20 +0100
committerwm4 <wm4@nowhere>2020-02-15 02:19:20 +0100
commita9acfa82c35c4d5a98737d1cfda5d56e622f9674 (patch)
tree10cf2bb9c86fdd5c5c13a08a8c9f8a5cb3ced140 /sub/sd_ass.c
parent641d102101087a3453398800febce2f65f104203 (diff)
downloadmpv-ytdl_sub_delayload.tar.bz2
mpv-ytdl_sub_delayload.tar.xz
Diffstat (limited to 'sub/sd_ass.c')
-rw-r--r--sub/sd_ass.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index eb80230f44..5443a688d4 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -155,7 +155,11 @@ static int init(struct sd *sd)
char *extradata = sd->codec->extradata;
int extradata_size = sd->codec->extradata_size;
- if (strcmp(sd->codec->codec, "ass") != 0) {
+ // Note: accept "null" as alias for "ass", so EDL delay_open subtitle
+ // streams work.
+ if (strcmp(sd->codec->codec, "ass") != 0 &&
+ strcmp(sd->codec->codec, "null") != 0)
+ {
ctx->is_converted = true;
ctx->converter = lavc_conv_create(sd->log, sd->codec->codec, extradata,
extradata_size);