[FFmpeg-devel] [PATCH v2 2/2] avformat/mpegtsenc: reindent the code

Marton Balint cus at passwd.hu
Tue Aug 25 00:02:54 EEST 2020



On Mon, 24 Aug 2020, lance.lmwang at gmail.com wrote:

> From: Limin Wang <lance.lmwang at gmail.com>
>
> Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
> ---
> libavformat/mpegtsenc.c | 36 ++++++++++++++++++------------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> index 5a9e6fd..1559ce6 100644
> --- a/libavformat/mpegtsenc.c
> +++ b/libavformat/mpegtsenc.c
> @@ -1744,24 +1744,24 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
>                 av_log(s, AV_LOG_ERROR, "AAC bitstream not in ADTS format "
>                                         "and extradata missing\n");
>             } else {
> -            av_init_packet(&pkt2);
> -            pkt2.data = pkt->data;
> -            pkt2.size = pkt->size;
> -            av_assert0(pkt->dts != AV_NOPTS_VALUE);
> -            pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base);
> -
> -            ret = avio_open_dyn_buf(&ts_st->amux->pb);
> -            if (ret < 0)
> -                return ret;
> -
> -            ret = av_write_frame(ts_st->amux, &pkt2);
> -            if (ret < 0) {
> -                ffio_free_dyn_buf(&ts_st->amux->pb);
> -                return ret;
> -            }
> -            size            = avio_close_dyn_buf(ts_st->amux->pb, &data);
> -            ts_st->amux->pb = NULL;
> -            buf             = data;
> +                av_init_packet(&pkt2);
> +                pkt2.data = pkt->data;
> +                pkt2.size = pkt->size;
> +                av_assert0(pkt->dts != AV_NOPTS_VALUE);
> +                pkt2.dts = av_rescale_q(pkt->dts, st->time_base, ts_st->amux->streams[0]->time_base);
> +
> +                ret = avio_open_dyn_buf(&ts_st->amux->pb);
> +                if (ret < 0)
> +                    return ret;
> +
> +                ret = av_write_frame(ts_st->amux, &pkt2);
> +                if (ret < 0) {
> +                    ffio_free_dyn_buf(&ts_st->amux->pb);
> +                    return ret;
> +                }
> +                size            = avio_close_dyn_buf(ts_st->amux->pb, &data);
> +                ts_st->amux->pb = NULL;
> +                buf             = data;
>             }
>         }
>     } else if (st->codecpar->codec_id == AV_CODEC_ID_HEVC) {

LGTM, thanks.

Regards,
Marton


More information about the ffmpeg-devel mailing list