[FFmpeg-devel] [PATCH] avformat/nutenc: Fix indentation

[Leo Izen]

On 2/3/24 14:20, Andreas Rheinhardt wrote:
> Forgotten after 82beb46e65e5f820b187355bf757725c22a59c45.
> Also use loop-scope for iterators while at it.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>   libavformat/nutenc.c | 30 +++++++++++++++---------------
>   1 file changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
> index a5198c7ca9..5e0e36babe 100644
> --- a/libavformat/nutenc.c
> +++ b/libavformat/nutenc.c
> @@ -1063,21 +1063,21 @@ static int nut_write_packet(AVFormatContext *s, AVPacket *pkt)
>           ffio_free_dyn_buf(&dyn_bc);
>   
>           if (nut->write_index) {
> -        if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
> -            goto fail;
> -
> -        if ((1ll<<60) % nut->sp_count == 0)
> -            for (i=0; i<s->nb_streams; i++) {
> -                int j;
> -                StreamContext *nus = &nut->stream[i];
> -                av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts));
> -                if (!nus->keyframe_pts) {
> -                    ret = AVERROR(ENOMEM);
> -                    goto fail;
> -                }
> -                for (j=nut->sp_count == 1 ? 0 : nut->sp_count; j<2*nut->sp_count; j++)
> -                    nus->keyframe_pts[j] = AV_NOPTS_VALUE;
> -        }
> +            if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts)) < 0)
> +                goto fail;
> +
> +            if ((1ll<<60) % nut->sp_count == 0)
> +                for (unsigned i = 0; i < s->nb_streams; i++) {
> +                    StreamContext *nus = &nut->stream[i];
> +                    av_reallocp_array(&nus->keyframe_pts, 2*nut->sp_count, sizeof(*nus->keyframe_pts));
> +                    if (!nus->keyframe_pts) {
> +                        ret = AVERROR(ENOMEM);
> +                        goto fail;
> +                    }
> +                    for (int j = nut->sp_count == 1 ? 0 : nut->sp_count;
> +                         j < 2 * nut->sp_count; j++)
> +                        nus->keyframe_pts[j] = AV_NOPTS_VALUE;
> +            }
>           }
>       }
>       av_assert0(nus->last_pts != AV_NOPTS_VALUE);

If we're changing this block of code anyway, could we possibly replace 
this line:

             if ((ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 
/*unused*/, pkt->dts)) < 0)
                 goto fail;

With something like this?

ret = ff_nut_add_sp(nut, nut->last_syncpoint_pos, 0 /*unused*/, pkt->dts);
if (ret < 0)
     goto fail;

It's a bit cleaner.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 236 bytes
Desc: OpenPGP digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20240204/78f21590/attachment.sig>