highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/aacdec: strictly conform to K&R style

Browse Source 
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>
This commit is contained in:
Marcus B Spencer
2024-05-18 10:35:36 -05:00
committed by Lynne
parent 7e59f02c14
commit 8b8b555de0
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/aacdec.c
View File

@@ -143,9 +143,8 @@ static int handle_id3(AVFormatContext *s, AVPacket *pkt)
int ret; int ret;
ret = av_append_packet(s->pb, pkt, ff_id3v2_tag_len(pkt->data) - pkt->size); ret = av_append_packet(s->pb, pkt, ff_id3v2_tag_len(pkt->data) - pkt->size);
if (ret < 0) { if (ret < 0)
return ret; return ret;
}
ffio_init_read_context(&pb, pkt->data, pkt->size); ffio_init_read_context(&pb, pkt->data, pkt->size);
ff_id3v2_read_dict(&pb.pub, &metadata, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta); ff_id3v2_read_dict(&pb.pub, &metadata, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
@@ -175,9 +174,8 @@ retry:
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret < ADTS_HEADER_SIZE) { if (ret < ADTS_HEADER_SIZE)
return AVERROR(EIO); return AVERROR(EIO);
}
if ((AV_RB16(pkt->data) >> 4) != 0xfff) { if ((AV_RB16(pkt->data) >> 4) != 0xfff) {
// Parse all the ID3 headers between frames // Parse all the ID3 headers between frames
@@ -185,9 +183,8 @@ retry:
av_assert2(append > 0); av_assert2(append > 0);
ret = av_append_packet(s->pb, pkt, append); ret = av_append_packet(s->pb, pkt, append);
if (ret != append) { if (ret != append)
return AVERROR(EIO); return AVERROR(EIO);
}
if (!ff_id3v2_match(pkt->data, ID3v2_DEFAULT_MAGIC)) { if (!ff_id3v2_match(pkt->data, ID3v2_DEFAULT_MAGIC)) {
av_packet_unref(pkt); av_packet_unref(pkt);
ret = adts_aac_resync(s); ret = adts_aac_resync(s);
@@ -200,9 +197,8 @@ retry:
} }
fsize = (AV_RB32(pkt->data + 3) >> 13) & 0x1FFF; fsize = (AV_RB32(pkt->data + 3) >> 13) & 0x1FFF;
if (fsize < ADTS_HEADER_SIZE) { if (fsize < ADTS_HEADER_SIZE)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
}
ret = av_append_packet(s->pb, pkt, fsize - pkt->size); ret = av_append_packet(s->pb, pkt, fsize - pkt->size);