From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec/msmpeg4enc: Fix indentation
Date: Fri, 7 Oct 2022 13:41:47 +0200
Message-ID: <GV1P250MB07370A4F027D696858F8F6B88F5F9@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB07443BBD901826F5F97455698F5C9@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
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
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2022-10-07 11:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-06 15:19 Andreas Rheinhardt
2022-10-06 15:19 ` [FFmpeg-devel] [PATCH 2/2] avcodec/wmv2enc: Inline extradata size Andreas Rheinhardt
2022-10-07 11:41 ` Andreas Rheinhardt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=GV1P250MB07370A4F027D696858F8F6B88F5F9@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM \
--to=andreas.rheinhardt@outlook.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git