From 96fc66ca55a306575faf6d3b17ea58aae4c6c046 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Tue, 31 May 2022 11:37:55 +0200 Subject: [PATCH 6/8] libavcodec/jpeg2000_parser: Reindent --- libavcodec/jpeg2000_parser.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/jpeg2000_parser.c b/libavcodec/jpeg2000_parser.c index bd966b3acf..e66ef0e1f0 100644 --- a/libavcodec/jpeg2000_parser.c +++ b/libavcodec/jpeg2000_parser.c @@ -161,21 +161,21 @@ static int find_frame_end(JPEG2000ParserContext *m, const uint8_t *buf, int buf_ } m->in_codestream = 0; } else if (m->in_codestream) { - if ((state64 & 0xFFFF) == 0xFF90) { // Are we in tile part header? - m->read_tp = 8; - } else if (info_marker((state64 & 0xFFFF0000)>>16) && pc->frame_start_found && (state64 & 0xFFFF)) { - // Calculate number of bytes to skip to get to end of the next marker. - m->skip_bytes = (state64 & 0xFFFF)-1; - - // If the next marker is an info marker, skip to the end of of the marker length. - if (i + m->skip_bytes + 1 < buf_size) { - uint32_t next_state = (buf[i + m->skip_bytes] << 8) | buf[i + m->skip_bytes + 1]; - if (info_marker(next_state)) { - // Skip an additional 2 bytes to get to the end of the marker length. - m->skip_bytes += 2; + if ((state64 & 0xFFFF) == 0xFF90) { // Are we in tile part header? + m->read_tp = 8; + } else if (info_marker((state64 & 0xFFFF0000)>>16) && pc->frame_start_found && (state64 & 0xFFFF)) { + // Calculate number of bytes to skip to get to end of the next marker. + m->skip_bytes = (state64 & 0xFFFF)-1; + + // If the next marker is an info marker, skip to the end of of the marker length. + if (i + m->skip_bytes + 1 < buf_size) { + uint32_t next_state = (buf[i + m->skip_bytes] << 8) | buf[i + m->skip_bytes + 1]; + if (info_marker(next_state)) { + // Skip an additional 2 bytes to get to the end of the marker length. + m->skip_bytes += 2; + } } } - } } } -- 2.30.2