From d1222dd59cac26a591ce3b93bdf3adc5e1733568 Mon Sep 17 00:00:00 2001 From: Bradley Sepos Date: Mon, 28 May 2018 23:58:51 -0400 Subject: [PATCH] contrib: Use AV_CODEC_ID_ASS for FFmpeg. --- libhb/muxavformat.c | 4 ++-- libhb/stream.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c index c9115cf58..698096600 100644 --- a/libhb/muxavformat.c +++ b/libhb/muxavformat.c @@ -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 diff --git a/libhb/stream.c b/libhb/stream.c index 3ecc04356..ba9a17835 100644 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -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. */ -- 2.40.0