[FFmpeg-cvslog] avcodec/(movtext|srt|ttml|webvtt)enc: Reindent after previous commit
Andreas Rheinhardt
git at videolan.org
Wed Apr 28 00:14:50 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Thu Feb 25 20:33:44 2021 +0100| [6c497ac93bd98c78cc1dbba18319aa14a68fc28c] | committer: James Almer
avcodec/(movtext|srt|ttml|webvtt)enc: Reindent after previous commit
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c497ac93bd98c78cc1dbba18319aa14a68fc28c
---
libavcodec/movtextenc.c | 12 +++++-----
libavcodec/srtenc.c | 16 ++++++-------
libavcodec/ttmlenc.c | 61 +++++++++++++++++++++++--------------------------
libavcodec/webvttenc.c | 12 +++++-----
4 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/libavcodec/movtextenc.c b/libavcodec/movtextenc.c
index 1b37d135e1..3c166639ba 100644
--- a/libavcodec/movtextenc.c
+++ b/libavcodec/movtextenc.c
@@ -655,12 +655,12 @@ static int mov_text_encode_frame(AVCodecContext *avctx, unsigned char *buf,
return AVERROR(EINVAL);
}
- dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
- if (!dialog)
- return AVERROR(ENOMEM);
- mov_text_dialog(s, dialog);
- ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text);
- ff_ass_free_dialog(&dialog);
+ dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
+ if (!dialog)
+ return AVERROR(ENOMEM);
+ mov_text_dialog(s, dialog);
+ ff_ass_split_override_codes(&mov_text_callbacks, s, dialog->text);
+ ff_ass_free_dialog(&dialog);
for (j = 0; j < box_count; j++) {
box_types[j].encode(s);
diff --git a/libavcodec/srtenc.c b/libavcodec/srtenc.c
index 160f3bbf3a..08c52c2d56 100644
--- a/libavcodec/srtenc.c
+++ b/libavcodec/srtenc.c
@@ -244,14 +244,14 @@ static int encode_frame(AVCodecContext *avctx,
return AVERROR(EINVAL);
}
- dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
- if (!dialog)
- return AVERROR(ENOMEM);
- s->alignment_applied = 0;
- 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);
+ dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
+ if (!dialog)
+ return AVERROR(ENOMEM);
+ s->alignment_applied = 0;
+ 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 (!av_bprint_is_complete(&s->buffer))
diff --git a/libavcodec/ttmlenc.c b/libavcodec/ttmlenc.c
index a0c605b918..83485197c9 100644
--- a/libavcodec/ttmlenc.c
+++ b/libavcodec/ttmlenc.c
@@ -88,48 +88,45 @@ static int ttml_encode_frame(AVCodecContext *avctx, uint8_t *buf,
for (i=0; i<sub->num_rects; i++) {
const char *ass = sub->rects[i]->ass;
+ int ret;
if (sub->rects[i]->type != SUBTITLE_ASS) {
av_log(avctx, AV_LOG_ERROR, "Only SUBTITLE_ASS type supported.\n");
return AVERROR(EINVAL);
}
- dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
- if (!dialog)
- return AVERROR(ENOMEM);
+ dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
+ if (!dialog)
+ return AVERROR(ENOMEM);
- if (dialog->style) {
- av_bprintf(&s->buffer, "<span region=\"");
- av_bprint_escape(&s->buffer, dialog->style, NULL,
- AV_ESCAPE_MODE_XML,
- AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
- av_bprintf(&s->buffer, "\">");
- }
-
- {
- int ret = ff_ass_split_override_codes(&ttml_callbacks, s,
- dialog->text);
- int log_level = (ret != AVERROR_INVALIDDATA ||
- avctx->err_recognition & AV_EF_EXPLODE) ?
- AV_LOG_ERROR : AV_LOG_WARNING;
-
- if (ret < 0) {
- av_log(avctx, log_level,
- "Splitting received ASS dialog text %s failed: %s\n",
- dialog->text,
- av_err2str(ret));
-
- if (log_level == AV_LOG_ERROR) {
- ff_ass_free_dialog(&dialog);
- return ret;
- }
- }
-
- if (dialog->style)
- av_bprintf(&s->buffer, "</span>");
+ if (dialog->style) {
+ av_bprintf(&s->buffer, "<span region=\"");
+ av_bprint_escape(&s->buffer, dialog->style, NULL,
+ AV_ESCAPE_MODE_XML,
+ AV_ESCAPE_FLAG_XML_DOUBLE_QUOTES);
+ av_bprintf(&s->buffer, "\">");
+ }
+ ret = ff_ass_split_override_codes(&ttml_callbacks, s, dialog->text);
+ if (ret < 0) {
+ int log_level = (ret != AVERROR_INVALIDDATA ||
+ avctx->err_recognition & AV_EF_EXPLODE) ?
+ AV_LOG_ERROR : AV_LOG_WARNING;
+ av_log(avctx, log_level,
+ "Splitting received ASS dialog text %s failed: %s\n",
+ dialog->text,
+ av_err2str(ret));
+
+ if (log_level == AV_LOG_ERROR) {
ff_ass_free_dialog(&dialog);
+ return ret;
}
+ }
+
+ if (dialog->style)
+ av_bprintf(&s->buffer, "</span>");
+
+ ff_ass_free_dialog(&dialog);
}
if (!av_bprint_is_complete(&s->buffer))
diff --git a/libavcodec/webvttenc.c b/libavcodec/webvttenc.c
index 2419dd3d07..fcbd9698f4 100644
--- a/libavcodec/webvttenc.c
+++ b/libavcodec/webvttenc.c
@@ -171,12 +171,12 @@ static int webvtt_encode_frame(AVCodecContext *avctx,
return AVERROR(EINVAL);
}
- dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
- if (!dialog)
- return AVERROR(ENOMEM);
- webvtt_style_apply(s, dialog->style);
- ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text);
- ff_ass_free_dialog(&dialog);
+ dialog = ff_ass_split_dialog2(s->ass_ctx, ass);
+ if (!dialog)
+ return AVERROR(ENOMEM);
+ webvtt_style_apply(s, dialog->style);
+ ff_ass_split_override_codes(&webvtt_callbacks, s, dialog->text);
+ ff_ass_free_dialog(&dialog);
}
if (!av_bprint_is_complete(&s->buffer))
More information about the ffmpeg-cvslog
mailing list