diff options
| author | Clément Bœsch <u@pkh.me> | 2014-10-11 12:57:37 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2014-10-15 19:24:40 +0200 |
| commit | bf700a995da4ff3ef891f3d4621b01fe72d0b12d (patch) | |
| tree | 0c191329d8c50c290708362ed96f52fc9aa4097b /libavformat | |
| parent | b243393e8b4b0a24b21afc732697047c8b48fb58 (diff) | |
avformat/assenc: support remuxing old V4 ASS form (SSA)
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/assenc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavformat/assenc.c b/libavformat/assenc.c index d495ce3a92..822596778a 100644 --- a/libavformat/assenc.c +++ b/libavformat/assenc.c @@ -35,6 +35,7 @@ typedef struct ASSContext{ DialogueLine *dialogue_cache; DialogueLine *last_added_dialogue; int cache_size; + int ssa_mode; }ASSContext; static int write_header(AVFormatContext *s) @@ -53,8 +54,10 @@ static int write_header(AVFormatContext *s) avio_write(s->pb, avctx->extradata, avctx->extradata_size); if (avctx->extradata[avctx->extradata_size - 1] != '\n') avio_write(s->pb, "\r\n", 2); + ass->ssa_mode = !strstr(avctx->extradata, "\n[V4+ Styles]"); if (!strstr(avctx->extradata, "\n[Events]")) - avio_printf(s->pb, "[Events]\r\nFormat: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text\r\n"); + avio_printf(s->pb, "[Events]\r\nFormat: %s, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text\r\n", + ass->ssa_mode ? "Marked" : "Layer"); } avio_flush(s->pb); @@ -154,6 +157,9 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) if (*p == ',') p++; + if (ass->ssa_mode && !strncmp(p, "Marked=", 7)) + p += 7; + layer = strtol(p, &p, 10); if (*p == ',') p++; @@ -164,7 +170,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) if (hh1 > 9) hh1 = 9, mm1 = 59, ss1 = 59, ms1 = 99; if (hh2 > 9) hh2 = 9, mm2 = 59, ss2 = 59, ms2 = 99; - dialogue->line = av_asprintf("%ld,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s", + dialogue->line = av_asprintf("%s%ld,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s", + ass->ssa_mode ? "Marked=" : "", layer, hh1, mm1, ss1, ms1, hh2, mm2, ss2, ms2, p); if (!dialogue->line) { av_free(dialogue); |