| Message ID | AS8P250MB07443BBD901826F5F97455698F5C9@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | ddbaf6227b55df387ad8fa8e6e96cb3cd02d6f97 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] avcodec/msmpeg4enc: Fix indentation | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Andreas Rheinhardt: > Forgotten after 2b9ab1d54a35f7d689b2396cfc59f9dbdcae391f. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/msmpeg4enc.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c > index e40acdf3fc..f0d0045e69 100644 > --- a/libavcodec/msmpeg4enc.c > +++ b/libavcodec/msmpeg4enc.c > @@ -279,15 +279,15 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) > > void ff_msmpeg4_encode_ext_header(MpegEncContext * s) > { > - unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); > - put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 > + unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); > + put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 > > - put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047)); > + put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047)); > > - if(s->msmpeg4_version>=3) > - put_bits(&s->pb, 1, s->flipflop_rounding); > - else > - av_assert0(s->flipflop_rounding==0); > + if (s->msmpeg4_version >= 3) > + put_bits(&s->pb, 1, s->flipflop_rounding); > + else > + av_assert0(!s->flipflop_rounding); > } > > void ff_msmpeg4_encode_motion(MpegEncContext * s, Will apply these trivialities tonight unless there are objections. - Andreas
diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index e40acdf3fc..f0d0045e69 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -279,15 +279,15 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) void ff_msmpeg4_encode_ext_header(MpegEncContext * s) { - unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); - put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 + unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1); + put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29 - put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047)); + put_bits(&s->pb, 11, FFMIN(s->bit_rate / 1024, 2047)); - if(s->msmpeg4_version>=3) - put_bits(&s->pb, 1, s->flipflop_rounding); - else - av_assert0(s->flipflop_rounding==0); + if (s->msmpeg4_version >= 3) + put_bits(&s->pb, 1, s->flipflop_rounding); + else + av_assert0(!s->flipflop_rounding); } void ff_msmpeg4_encode_motion(MpegEncContext * s,
Forgotten after 2b9ab1d54a35f7d689b2396cfc59f9dbdcae391f. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/msmpeg4enc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)