[FFmpeg-cvslog] lavc/srtenc: do not emit any subrip tags with text codec
Clément Bœsch
git at videolan.org
Sun May 1 15:18:04 CEST 2016
ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Sun May 1 15:16:34 2016 +0200| [9f3dd530500e898b5ee4106b448562602371ae71] | committer: Clément Bœsch
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 at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9f3dd530500e898b5ee4106b448562602371ae71
---
libavcodec/srtenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c
index 5143984..34f0f0d 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
More information about the ffmpeg-cvslog
mailing list