]> granicus.if.org Git - handbrake/commitdiff
contrib: Use AV_CODEC_ID_ASS for FFmpeg.
authorBradley Sepos <bradley@bradleysepos.com>
Tue, 29 May 2018 03:58:51 +0000 (23:58 -0400)
committerBradley Sepos <bradley@bradleysepos.com>
Tue, 29 May 2018 03:58:51 +0000 (23:58 -0400)
libhb/muxavformat.c
libhb/stream.c

index c9115cf58fc3e970de4d69429b53c93b85db46c7..698096600c7eb2938c5a6a030c159d7e182f95b5 100644 (file)
@@ -800,7 +800,7 @@ static int avformatInit( hb_mux_object_t * m )
                 }
                 else
                 {
-                    track->st->codecpar->codec_id = AV_CODEC_ID_SSA;
+                    track->st->codecpar->codec_id = AV_CODEC_ID_ASS;
                     need_fonts = 1;
 
                     if (subtitle->extradata_size)
@@ -1315,7 +1315,7 @@ 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_SSA &&
+            if (track->st->codecpar->codec_id == AV_CODEC_ID_ASS &&
                 job->mux == HB_MUX_AV_MKV)
             {
                 // avformat requires the this additional information
index 3ecc043569917b76ae70bec1c4bfe2f6e786536c..ba9a1783523523feca1c779f886bc45aeff36d6b 100644 (file)
@@ -5327,7 +5327,7 @@ static void add_ffmpeg_subtitle( hb_title_t *title, hb_stream_t *stream, int id
             subtitle->config.dest = PASSTHRUSUB;
             subtitle->codec = WORK_DECTX3GSUB;
             break;
-        case AV_CODEC_ID_SSA:
+        case AV_CODEC_ID_ASS:
             subtitle->format = TEXTSUB;
             subtitle->source = SSASUB;
             subtitle->config.dest = PASSTHRUSUB;
@@ -5852,7 +5852,7 @@ hb_buffer_t * hb_ffmpeg_read( hb_stream_t *stream )
      * either field. This is not a problem because the VOB decoder can extract this
      * information from the packet payload itself.
      *
-     * SSA subtitles (AV_CODEC_ID_SSA) do not have their duration stored in
+     * SSA subtitles (AV_CODEC_ID_ASS) do not have their duration stored in
      * either field. This is not a problem because the SSA decoder can extract this
      * information from the packet payload itself.
      */