diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-06-27 22:35:42 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-06-27 22:35:42 +0000 |
| commit | 9e74966b3faea4af41bf43858568fc505b1001e8 (patch) | |
| tree | 14eea7e514a1d20ff58e5c91e22a637d66668eb0 | |
| parent | 4cf0b43ac9081c9414ef5753572a59ba6b7d3110 (diff) | |
| download | ffmpeg-9e74966b3faea4af41bf43858568fc505b1001e8.tar.gz | |
Cosmetics: merge "} else" and "if (...) {" lines, less confusing.
Originally committed as revision 23837 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavfilter/parseutils.c | 3 |
1 files changed, 1 insertions, 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); |