diff mbox

[FFmpeg-devel] libavformat/bink.c: fix warning due to misleading indentation

Message ID CAHucTJvTfhnRwLLpZ=KbKWXb2YfyzE4y4z8Zj_4GcqEF77gvNA@mail.gmail.com
State Accepted
Headers show

Commit Message

Adriano Pallavicino Oct. 2, 2016, 4:24 p.m. UTC

Comments

Josh Dekker Oct. 2, 2016, 6:35 p.m. UTC | #1 
Hi Adriano,

We appreciate the patches, but is it possible you could maybe collate 
your cosmetic patches and send them as a larger set?

This patch LGTM though, will push tomorrow if no further comments.
Josh Dekker Oct. 3, 2016, 2:48 p.m. UTC | #2 
On 02/10/2016 19:35, Josh de Kock wrote:
> Hi Adriano,
>
> We appreciate the patches, but is it possible you could maybe collate
> your cosmetic patches and send them as a larger set?
>
> This patch LGTM though, will push tomorrow if no further comments.
>

Applied.
Adriano Pallavicino Oct. 3, 2016, 4:59 p.m. UTC | #3 
Sure.

2016-10-03 16:48 GMT+02:00 Josh de Kock <josh@itanimul.li>:

> On 02/10/2016 19:35, Josh de Kock wrote:
>
>> Hi Adriano,
>>
>> We appreciate the patches, but is it possible you could maybe collate
>> your cosmetic patches and send them as a larger set?
>>
>> This patch LGTM though, will push tomorrow if no further comments.
>>
>>
> Applied.
>
>
> --
> Josh
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
diff mbox

Patch

From 78821da34356c1700695f19923e4e8b130b96963 Mon Sep 17 00:00:00 2001
From: Adriano Pallavicino <adriano.pallavicino@gmail.com>
Date: Sun, 2 Oct 2016 18:16:21 +0200
Subject: [PATCH] Fix warning: [-Wmisleading-indentation] bink.c
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is output of gcc:

libavformat/bink.c:68:9: warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
         if (((b[0] == 'B' && b[1] == 'I' && b[2] == 'K' &&
         ^~
libavformat/bink.c:77:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the ‘if’
             b += SMUSH_BLOCK_SIZE;

 Changes to be committed:
	modified:   libavformat/bink.c

Signed-off-by: Adriano Pallavicino <adriano.pallavicino@gmail.com>
---
 libavformat/bink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/bink.c b/libavformat/bink.c
index c214eb3..e6f0cb7 100644
--- a/libavformat/bink.c
+++ b/libavformat/bink.c
@@ -74,7 +74,7 @@  static int probe(AVProbeData *p)
             AV_RL32(b+24) > 0 && AV_RL32(b+24) <= BINK_MAX_HEIGHT &&
             AV_RL32(b+28) > 0 && AV_RL32(b+32) > 0)  // fps num,den
             return AVPROBE_SCORE_MAX;
-            b += SMUSH_BLOCK_SIZE;
+        b += SMUSH_BLOCK_SIZE;
     } while (smush && b < p->buf + p->buf_size - 32);
     return 0;
 }
-- 
2.7.4