aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-23 13:56:18 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-08-28 15:25:18 +0200
commit0871273a2ff8e7ec7d44d9b4e24e2d78346eb2f0 (patch)
treebad29755d4c0f830720dd46c416d082ea0ad8f0b
parente304f5f7583de6fff0b36e043feacb6e02261a96 (diff)
downloadffmpeg-0871273a2ff8e7ec7d44d9b4e24e2d78346eb2f0.tar.gz
avformat/flac_picture: Reindentation
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavformat/flac_picture.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c
index 3b69654ff6..0effbf04f6 100644
--- a/libavformat/flac_picture.c
+++ b/libavformat/flac_picture.c
@@ -150,19 +150,18 @@ int ff_flac_parse_picture(AVFormatContext *s, uint8_t **bufp, int buf_size,
data->data += bytestream2_tell(&g);
data->size = len + AV_INPUT_BUFFER_PADDING_SIZE;
} else {
- if (!(data = av_buffer_alloc(len + AV_INPUT_BUFFER_PADDING_SIZE))) {
- return AVERROR(ENOMEM);
- }
+ if (!(data = av_buffer_alloc(len + AV_INPUT_BUFFER_PADDING_SIZE)))
+ return AVERROR(ENOMEM);
- if (trunclen == 0) {
- bytestream2_get_bufferu(&g, data->data, len);
- } else {
- // If truncation was detected copy all data from block and read missing bytes
- // not included in the block size
- bytestream2_get_bufferu(&g, data->data, left);
- if (avio_read(s->pb, data->data + len - trunclen, trunclen) < trunclen)
- RETURN_ERROR(AVERROR_INVALIDDATA);
- }
+ if (trunclen == 0) {
+ bytestream2_get_bufferu(&g, data->data, len);
+ } else {
+ // If truncation was detected copy all data from block and
+ // read missing bytes not included in the block size.
+ bytestream2_get_bufferu(&g, data->data, left);
+ if (avio_read(s->pb, data->data + len - trunclen, trunclen) < trunclen)
+ RETURN_ERROR(AVERROR_INVALIDDATA);
+ }
}
memset(data->data + len, 0, AV_INPUT_BUFFER_PADDING_SIZE);