From: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/3] avformat/webpenc: Return early to reduce indentation
Date: Thu, 7 Dec 2023 19:29:44 +0100
Message-ID: <AS8P250MB07447623D3EBE7D62A29E0308F8BA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <AS8P250MB0744B198F01BF81A60ED7DD18FA5A@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> libavformat/webpenc.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavformat/webpenc.c b/libavformat/webpenc.c
> index fb0cca3922..9ac353c967 100644
> --- a/libavformat/webpenc.c
> +++ b/libavformat/webpenc.c
> @@ -80,12 +80,13 @@ static int flush(AVFormatContext *s, int trailer, int64_t pts)
> {
> WebpContext *w = s->priv_data;
> AVStream *st = s->streams[0];
> -
> - if (w->last_pkt->size) {
> int skip = 0;
> unsigned flags = 0;
> int vp8x = 0;
>
> + if (!w->last_pkt->size)
> + return 0;
> +
> if (AV_RL32(w->last_pkt->data) == AV_RL32("RIFF"))
> skip = 12;
>
> @@ -139,7 +140,6 @@ static int flush(AVFormatContext *s, int trailer, int64_t pts)
> }
> avio_write(s->pb, w->last_pkt->data + skip, w->last_pkt->size - skip);
> av_packet_unref(w->last_pkt);
> - }
>
> return 0;
> }
Will apply this patchset tomorrow 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:[~2023-12-07 18:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-03 16:09 Andreas Rheinhardt
2023-11-03 16:11 ` [FFmpeg-devel] [PATCH 2/3] avformat/webpenc: Reindent after the previous commit Andreas Rheinhardt
2023-11-03 16:11 ` [FFmpeg-devel] [PATCH 3/3] avformat/webpenc: Write correct size for single images when unseekable Andreas Rheinhardt
2023-12-07 18:29 ` 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=AS8P250MB07447623D3EBE7D62A29E0308F8BA@AS8P250MB0744.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