summaryrefslogtreecommitdiff
path: root/libavformat/assdec.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2014-09-20 19:31:29 +0200
committerClément Bœsch <u@pkh.me>2014-09-27 17:32:13 +0200
commit0aa5c5a89e2b6a1e467dd47d4651bb7c7ad9dc95 (patch)
treecbca0a4ca731a9459250e3ee063cd17905ebb15d /libavformat/assdec.c
parent9ec52e5533cf10d1f27e4bf3b6eb42222303890f (diff)
downloadffmpeg-0aa5c5a89e2b6a1e467dd47d4651bb7c7ad9dc95.tar.gz
avformat/assdec: reindent after previous commit
Diffstat (limited to 'libavformat/assdec.c')
-rw-r--r--libavformat/assdec.c31
1 files changed, 15 insertions, 16 deletions
diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index 8e6206a9d0..9c3d3acf80 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -124,28 +124,27 @@ static int ass_read_header(AVFormatContext *s)
av_bprint_init(&line, 0, AV_BPRINT_SIZE_UNLIMITED);
av_bprint_init(&rline, 0, AV_BPRINT_SIZE_UNLIMITED);
- // TODO reindent
for (;;) {
int64_t pos = get_line(&line, &tr);
- int64_t ts_start = AV_NOPTS_VALUE;
- int duration = -1;
- AVPacket *sub;
+ int64_t ts_start = AV_NOPTS_VALUE;
+ int duration = -1;
+ AVPacket *sub;
if (!line.str[0]) // EOF
break;
- if (read_dialogue(ass, &rline, line.str, &ts_start, &duration) < 0) {
- av_bprintf(&header, "%s", line.str);
- continue;
- }
- sub = ff_subtitles_queue_insert(&ass->q, rline.str, rline.len, 0);
- if (!sub) {
- res = AVERROR(ENOMEM);
- goto end;
- }
- sub->pos = pos;
- sub->pts = ts_start;
- sub->duration = duration;
+ if (read_dialogue(ass, &rline, line.str, &ts_start, &duration) < 0) {
+ av_bprintf(&header, "%s", line.str);
+ continue;
+ }
+ sub = ff_subtitles_queue_insert(&ass->q, rline.str, rline.len, 0);
+ if (!sub) {
+ res = AVERROR(ENOMEM);
+ goto end;
+ }
+ sub->pos = pos;
+ sub->pts = ts_start;
+ sub->duration = duration;
}
av_bprint_finalize(&line, NULL);