From 9e74966b3faea4af41bf43858568fc505b1001e8 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 27 Jun 2010 22:35:42 +0000
Subject: [PATCH] Cosmetics: merge "} else" and "if (...) {" lines, less
 confusing.

Originally committed as revision 23837 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavfilter/parseutils.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavfilter/parseutils.c b/libavfilter/parseutils.c
index f87d9084cf..7f5baa00cb 100644
--- a/libavfilter/parseutils.c
+++ b/libavfilter/parseutils.c
@@ -234,8 +234,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, void *log_ctx)
         rgba_color[1] = rgba >> 16;
         rgba_color[2] = rgba >> 8;
         rgba_color[3] = rgba;
-    } else
-    if (!strncmp(color_string2, "0x", 2)) {
+    } else if (!strncmp(color_string2, "0x", 2)) {
         char *tail;
         int len = strlen(color_string2);
         unsigned int rgba = strtoul(color_string2, &tail, 16);