From: Clément Bœsch <u@pkh.me>
Date: Sun, 1 May 2016 13:16:34 +0000 (+0200)
Subject: lavc/srtenc: do not emit any subrip tags with text codec
X-Git-Tag: android-x86-7.1-r1~5425
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9f3dd530500e898b5ee4106b448562602371ae71;p=android-x86%2Fexternal-ffmpeg.git

lavc/srtenc: do not emit any subrip tags with text codec

Fixes presence of opening tags when running
  ffmpeg -i x.ass -c text x.srt

Reported-by: Jean First <jeanfirst@gmail.com>
---

diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c
index 51439843b9..34f0f0d5e6 100644
--- 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