[FFmpeg-cvslog] r23837 - trunk/libavfilter/parseutils.c

stefano subversion
Mon Jun 28 00:35:42 CEST 2010


Author: stefano
Date: Mon Jun 28 00:35:42 2010
New Revision: 23837

Log:
Cosmetics: merge "} else" and "if (...) {" lines, less confusing.

Modified:
   trunk/libavfilter/parseutils.c

Modified: trunk/libavfilter/parseutils.c
==============================================================================
--- trunk/libavfilter/parseutils.c	Mon Jun 28 00:35:39 2010	(r23836)
+++ trunk/libavfilter/parseutils.c	Mon Jun 28 00:35:42 2010	(r23837)
@@ -234,8 +234,7 @@ int av_parse_color(uint8_t *rgba_color, 
         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);



More information about the ffmpeg-cvslog mailing list