[FFmpeg-devel] [PATCH 14/17] avformat/assdec: reindent after previous commit

[Clément Bœsch]

On Sat, Sep 20, 2014 at 10:27:54PM +0200, Clément Bœsch wrote:
> ---
>  libavformat/assdec.c | 31 +++++++++++++++----------------
>  1 file changed, 15 insertions(+), 16 deletions(-)
> 
> diff --git a/libavformat/assdec.c b/libavformat/assdec.c
> index 2187c7d..d33830e 100644
> --- a/libavformat/assdec.c
> +++ b/libavformat/assdec.c
> @@ -120,28 +120,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);

Pushed as well. Whole patchset is upstream. Thanks.

-- 
Clément B.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: not available
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20140927/9c4cc995/attachment.asc>