[FFmpeg-devel] [PATCH v2 4/4] lavf/mpegtsenc: misc style fixes

[mypopy at gmail.com]

On Wed, May 27, 2020 at 2:58 PM Marton Balint <cus at passwd.hu> wrote:
>
>
>
> On Wed, 27 May 2020, Jun Zhao wrote:
>
> > From: Jun Zhao <barryjzhao at tencent.com>
> >
> > commit 32aeba12755 missed coding style fix.
> >
> > Signed-off-by: Jun Zhao <barryjzhao at tencent.com>
> > ---
> > libavformat/mpegtsenc.c | 24 ++++++++++++------------
> > 1 file changed, 12 insertions(+), 12 deletions(-)
> >
> > diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
> > index bf1a7ee..de9819b 100644
> > --- a/libavformat/mpegtsenc.c
> > +++ b/libavformat/mpegtsenc.c
> > @@ -1432,10 +1432,10 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
> >             if (ts->m2ts_mode &&
> >                 st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO &&
> >                 st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> > -                        /* set PES_extension_flag */
> > -                        pes_extension = 1;
> > -                        flags |= 0x01;
> > -                        header_len += 3;
> > +                /* set PES_extension_flag */
> > +                pes_extension = 1;
> > +                flags |= 0x01;
> > +                header_len += 3;
> >             }
> >             if (is_dvb_teletext) {
> >                 pes_header_stuffing_bytes = 0x24 - header_len;
> > @@ -1478,14 +1478,14 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
> >                 *q++ = 0x00 | 0x60;
> >             }
> >             /* For Blu-ray AC3 Audio Setting extended flags */
> > -          if (ts->m2ts_mode &&
> > -              pes_extension &&
> > -              st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> > -                      flags = 0x01; /* set PES_extension_flag_2 */
> > -                      *q++ = flags;
> > -                      *q++ = 0x80 | 0x01; /* marker bit + extension length */
> > -                      *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
> > -              }
> > +            if (ts->m2ts_mode &&
> > +                pes_extension &&
> > +                st->codecpar->codec_id == AV_CODEC_ID_AC3) {
> > +                flags = 0x01; /* set PES_extension_flag_2 */
> > +                *q++ = flags;
> > +                *q++ = 0x80 | 0x01; /* marker bit + extension length */
> > +                *q++ = 0x00 | 0x71; /* for AC3 Audio (specifically on blue-rays) */
> > +            }
> >
>
> LGTM, thanks.
>
Pushed patch 3-4