From: Nicolas Gaullier <nicolas.gaullier@cji.paris>
To: ffmpeg-devel@ffmpeg.org
Cc: Nicolas Gaullier <nicolas.gaullier@cji.paris>
Subject: [FFmpeg-devel] [PATCH 5/6] avformat/wavdec.c: Reindent after last commit
Date: Mon, 13 Feb 2023 19:09:35 +0100
Message-ID: <20230213180936.815-6-nicolas.gaullier@cji.paris> (raw)
In-Reply-To: <20230213180936.815-1-nicolas.gaullier@cji.paris>
---
libavformat/wavdec.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index fd9ca89880..29192e48f0 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -793,14 +793,14 @@ smv_out:
size = FFMIN(S337M_MAX_OFFSET, left);
ret = ff_s337m_get_packet(s->pb, pkt, size, NULL, s, st->codecpar->bits_per_coded_sample);
} else {
- size = wav->max_size;
- if (st->codecpar->block_align > 1) {
- if (size < st->codecpar->block_align)
- size = st->codecpar->block_align;
- size = (size / st->codecpar->block_align) * st->codecpar->block_align;
- }
- size = FFMIN(size, left);
- ret = av_get_packet(s->pb, pkt, size);
+ size = wav->max_size;
+ if (st->codecpar->block_align > 1) {
+ if (size < st->codecpar->block_align)
+ size = st->codecpar->block_align;
+ size = (size / st->codecpar->block_align) * st->codecpar->block_align;
+ }
+ size = FFMIN(size, left);
+ ret = av_get_packet(s->pb, pkt, size);
}
if (ret < 0)
--
2.30.2
_______________________________________________
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".
next prev parent reply other threads:[~2023-02-13 18:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 18:09 [FFmpeg-devel] [PATCH 0/6] wavdev: s337m support Nicolas Gaullier
2023-02-13 18:09 ` [FFmpeg-devel] [PATCH 1/6] avformat/s337m: Split read_packet/get_packet Nicolas Gaullier
2023-02-16 10:36 ` Tomas Härdin
2023-02-13 18:09 ` [FFmpeg-devel] [PATCH 2/6] avformat/s337m: Consider container bit resolution Nicolas Gaullier
2023-02-16 10:36 ` Tomas Härdin
2023-02-17 9:44 ` Nicolas Gaullier
2023-02-21 9:47 ` Tomas Härdin
2023-02-21 10:43 ` Nicolas Gaullier
2023-02-22 10:07 ` Tomas Härdin
2023-02-13 18:09 ` [FFmpeg-devel] [PATCH 3/6] avformat/s337m: New ff_s337m_probe() Nicolas Gaullier
2023-02-16 10:36 ` Tomas Härdin
2023-02-17 10:12 ` Nicolas Gaullier
2023-02-21 9:41 ` Tomas Härdin
2023-02-21 10:57 ` Nicolas Gaullier
2023-02-13 18:09 ` [FFmpeg-devel] [PATCH 4/6] avformat/wavdec: s337m support Nicolas Gaullier
2023-02-16 10:36 ` Tomas Härdin
2023-02-17 10:30 ` Nicolas Gaullier
2023-02-21 9:53 ` Tomas Härdin
2023-02-21 12:30 ` Nicolas Gaullier
2023-02-22 10:10 ` Tomas Härdin
2023-02-13 18:09 ` Nicolas Gaullier [this message]
2023-02-13 18:09 ` [FFmpeg-devel] [PATCH 6/6] avformat/wavdec: Test s337m Nicolas Gaullier
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=20230213180936.815-6-nicolas.gaullier@cji.paris \
--to=nicolas.gaullier@cji.paris \
--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