From: Marcus B Spencer <marcus@marcusspencer.xyz>
To: ffmpeg-devel@ffmpeg.org
Cc: Marcus B Spencer <marcus@marcusspencer.xyz>
Subject: [FFmpeg-devel] [PATCH] avformat/aacdec: strictly conform to K&R style
Date: Sat, 18 May 2024 10:35:36 -0500
Message-ID: <20240518153536.25607-1-marcus@marcusspencer.xyz> (raw)
In-Reply-To: <52bc6ecd-ab9b-05dc-6188-027d3859b21b@passwd.hu>
In the K&R style, a single-statement block does not have braces.
Edit the code to conform to this rule.
It is FFmpeg's code formatting convention to use K&R style.
Signed-off-by: Marcus B Spencer <marcus@marcusspencer.xyz>
---
libavformat/aacdec.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c
index e267886e1a..d5324df4d5 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -143,9 +143,8 @@ static int handle_id3(AVFormatContext *s, AVPacket *pkt)
int ret;
ret = av_append_packet(s->pb, pkt, ff_id3v2_tag_len(pkt->data) - pkt->size);
- if (ret < 0) {
+ if (ret < 0)
return ret;
- }
ffio_init_read_context(&pb, pkt->data, pkt->size);
ff_id3v2_read_dict(&pb.pub, &metadata, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
@@ -175,9 +174,8 @@ retry:
if (ret < 0)
return ret;
- if (ret < ADTS_HEADER_SIZE) {
+ if (ret < ADTS_HEADER_SIZE)
return AVERROR(EIO);
- }
if ((AV_RB16(pkt->data) >> 4) != 0xfff) {
// Parse all the ID3 headers between frames
@@ -185,9 +183,8 @@ retry:
av_assert2(append > 0);
ret = av_append_packet(s->pb, pkt, append);
- if (ret != append) {
+ if (ret != append)
return AVERROR(EIO);
- }
if (!ff_id3v2_match(pkt->data, ID3v2_DEFAULT_MAGIC)) {
av_packet_unref(pkt);
ret = adts_aac_resync(s);
@@ -200,9 +197,8 @@ retry:
}
fsize = (AV_RB32(pkt->data + 3) >> 13) & 0x1FFF;
- if (fsize < ADTS_HEADER_SIZE) {
+ if (fsize < ADTS_HEADER_SIZE)
return AVERROR_INVALIDDATA;
- }
ret = av_append_packet(s->pb, pkt, fsize - pkt->size);
--
2.39.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:[~2024-05-18 15:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-18 13:50 Marcus B Spencer
2024-05-18 14:16 ` Marton Balint
2024-05-18 15:35 ` Marcus B Spencer [this message]
2024-05-18 23:27 ` Lynne via ffmpeg-devel
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=20240518153536.25607-1-marcus@marcusspencer.xyz \
--to=marcus@marcusspencer.xyz \
--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