Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'

[ffmpeg] / libavcodec / srtenc.c

diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c
index 51439843b9c8f790dd891b4f5a976d46ca8b3645..34f0f0d5e66d4b2626ea8d03742be84d423a8f7e 100644 (file)
--- a/libavcodec/srtenc.c
+++ b/libavcodec/srtenc.c
@@ -250,7 +250,8 @@ static int encode_frame(AVCodecContext *avctx,
             dialog = ff_ass_split_dialog(s->ass_ctx, ass, 0, &num);
             for (; dialog && num--; dialog++) {
                 s->alignment_applied = 0;
-                srt_style_apply(s, dialog->style);
+                if (avctx->codec_id == AV_CODEC_ID_SUBRIP)
+                    srt_style_apply(s, dialog->style);
                 ff_ass_split_override_codes(cb, s, dialog->text);
             }
         } else {
@@ -259,7 +260,8 @@ static int encode_frame(AVCodecContext *avctx,
             if (!dialog)
                 return AVERROR(ENOMEM);
             s->alignment_applied = 0;
-            srt_style_apply(s, dialog->style);
+            if (avctx->codec_id == AV_CODEC_ID_SUBRIP)
+                srt_style_apply(s, dialog->style);
             ff_ass_split_override_codes(cb, s, dialog->text);
             ff_ass_free_dialog(&dialog);
 #if FF_API_ASS_TIMING