From: John Stebbins <jstebbins.hb@gmail.com>
Date: Sun, 10 Jun 2018 00:36:19 +0000 (-0700)
Subject: muxavformat: Fix muxing SSA subtitles
X-Git-Tag: 1.2.0~342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3cd483eeddd8726bad862e811b31f75c1fad965;p=handbrake

muxavformat: Fix muxing SSA subtitles

ffmpeg expect SSA packets in matroska format.

Fixes https://github.com/HandBrake/HandBrake/issues/1379
---

diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c
index c648e7ca2..0e5d6f8ba 100644
--- a/libhb/muxavformat.c
+++ b/libhb/muxavformat.c
@@ -1317,41 +1317,6 @@ static int avformatMux(hb_mux_object_t *m, hb_mux_data_t *track, hb_buffer_t *bu
                     free(styleatom);
                 }
             }
-            if (track->st->codecpar->codec_id == AV_CODEC_ID_ASS &&
-                job->mux == HB_MUX_AV_MKV)
-            {
-                // avformat requires the this additional information
-                // which it parses and then strips away
-                int start_hh, start_mm, start_ss, start_ms;
-                int stop_hh, stop_mm, stop_ss, stop_ms, layer;
-                char *ssa;
-
-                start_hh = buf->s.start / (90000 * 60 * 60);
-                start_mm = (buf->s.start / (90000 * 60)) % 60;
-                start_ss = (buf->s.start / 90000) % 60;
-                start_ms = (buf->s.start / 900) % 100;
-                stop_hh = buf->s.stop / (90000 * 60 * 60);
-                stop_mm = (buf->s.stop / (90000 * 60)) % 60;
-                stop_ss = (buf->s.stop / 90000) % 60;
-                stop_ms = (buf->s.stop / 900) % 100;
-
-                // Skip the read-order field
-                ssa = strchr((char*)buf->data, ',');
-                if (ssa != NULL)
-                    ssa++;
-                // Skip the layer field
-                layer = strtol(ssa, NULL, 10);
-                ssa = strchr(ssa, ',');
-                if (ssa != NULL)
-                    ssa++;
-                sub_out = (uint8_t*)hb_strdup_printf(
-                    "Dialogue: %d,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s",
-                    layer,
-                    start_hh, start_mm, start_ss, start_ms,
-                    stop_hh, stop_mm, stop_ss, stop_ms, ssa);
-                pkt.data = sub_out;
-                pkt.size = strlen((char*)sub_out) + 1;
-            }
             if (pkt.data == NULL)
             {
                 // Memory allocation failure!