diff mbox series

[FFmpeg-devel,4/6] avformat/argo_brp: cosmetics

Message ID 20200926023817.7891-4-zane@zanevaniperen.com
State Accepted
Commit 97efac3ac11a3a6f799f1e32e5eb49e50e0d5042
Headers show
Series [FFmpeg-devel,1/6] avformat/argo_{asf, brp}: fix potential segfault in ff_argo_asf_fill_stream() | expand

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Zane van Iperen Sept. 26, 2020, 2:39 a.m. UTC 
Signed-off-by: Zane van Iperen <zane@zanevaniperen.com>
---
 libavformat/argo_brp.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/argo_brp.c b/libavformat/argo_brp.c
index d3aab92af0..4041183011 100644
--- a/libavformat/argo_brp.c
+++ b/libavformat/argo_brp.c
@@ -36,8 +36,8 @@ 
 #define BVID_HEADER_SIZE        16
 #define MASK_HEADER_SIZE        12
 #define BRP_MIN_BUFFER_SIZE     FFMAX3(FFMAX3(BRP_FILE_HEADER_SIZE,    \
-                                             BRP_BLOCK_HEADER_SIZE,   \
-                                             BRP_STREAM_HEADER_SIZE), \
+                                              BRP_BLOCK_HEADER_SIZE,   \
+                                              BRP_STREAM_HEADER_SIZE), \
                                       BVID_HEADER_SIZE,                \
                                       MASK_HEADER_SIZE)
 
@@ -289,14 +289,14 @@  static int argo_brp_read_header(AVFormatContext *s)
         av_log(s, AV_LOG_TRACE, "Searching %d blocks for BASF...", BRP_BASF_LOOKAHEAD);
 
         for (i = 0; i < BRP_BASF_LOOKAHEAD; i++) {
-        if ((ret = avio_read(pb, buf, BRP_BLOCK_HEADER_SIZE)) < 0)
-            return ret;
-        else if (ret != BRP_BLOCK_HEADER_SIZE)
-            return AVERROR(EIO);
+            if ((ret = avio_read(pb, buf, BRP_BLOCK_HEADER_SIZE)) < 0)
+                return ret;
+            else if (ret != BRP_BLOCK_HEADER_SIZE)
+                return AVERROR(EIO);
 
-        blk.stream_id = AV_RL32(buf + 0);
-        blk.start_ms  = AV_RL32(buf + 4);
-        blk.size      = AV_RL32(buf + 8);
+            blk.stream_id = AV_RL32(buf + 0);
+            blk.start_ms  = AV_RL32(buf + 4);
+            blk.size      = AV_RL32(buf + 8);
 
             if (blk.stream_id == brp->basf.index || blk.stream_id == -1)
                 break;