From d3044cf37fcd9225788293baa719df68558288be Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 21 Mar 2016 19:26:29 +0100
Subject: [PATCH] opt-test: Move some variable declarations to avoid block
 braces

---
 libavutil/opt.c | 69 ++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index b3435e0f0e..168d3dce0d 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -801,46 +801,45 @@ static const AVClass test_class = {
 int main(void)
 {
     int i;
+    TestContext test_ctx;
+    const char *options[] = {
+        "",
+        ":",
+        "=",
+        "foo=:",
+        ":=foo",
+        "=foo",
+        "foo=",
+        "foo",
+        "foo=val",
+        "foo==val",
+        "toggle=:",
+        "string=:",
+        "toggle=1 : foo",
+        "toggle=100",
+        "toggle==1",
+        "flags=+mu-lame : num=42: toggle=0",
+        "num=42 : string=blahblah",
+        "rational=0 : rational=1/2 : rational=1/-1",
+        "rational=-1/0",
+    };
+
+    test_ctx.class = &test_class;
 
     printf("\nTesting av_set_options_string()\n");
-    {
-        TestContext test_ctx;
-        const char *options[] = {
-            "",
-            ":",
-            "=",
-            "foo=:",
-            ":=foo",
-            "=foo",
-            "foo=",
-            "foo",
-            "foo=val",
-            "foo==val",
-            "toggle=:",
-            "string=:",
-            "toggle=1 : foo",
-            "toggle=100",
-            "toggle==1",
-            "flags=+mu-lame : num=42: toggle=0",
-            "num=42 : string=blahblah",
-            "rational=0 : rational=1/2 : rational=1/-1",
-            "rational=-1/0",
-        };
 
-        test_ctx.class = &test_class;
-        av_opt_set_defaults(&test_ctx);
-        test_ctx.string = av_strdup("default");
-        if (!test_ctx.string)
-            return AVERROR(ENOMEM);
+    av_opt_set_defaults(&test_ctx);
+    test_ctx.string = av_strdup("default");
+    if (!test_ctx.string)
+        return AVERROR(ENOMEM);
 
-        av_log_set_level(AV_LOG_DEBUG);
+    av_log_set_level(AV_LOG_DEBUG);
 
-        for (i=0; i < FF_ARRAY_ELEMS(options); i++) {
-            av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]);
-            if (av_set_options_string(&test_ctx, options[i], "=", ":") < 0)
-                av_log(&test_ctx, AV_LOG_ERROR, "Error setting options string: '%s'\n", options[i]);
-            printf("\n");
-        }
+    for (i = 0; i < FF_ARRAY_ELEMS(options); i++) {
+        av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]);
+        if (av_set_options_string(&test_ctx, options[i], "=", ":") < 0)
+            av_log(&test_ctx, AV_LOG_ERROR, "Error setting options string: '%s'\n", options[i]);
+        printf("\n");
     }
 
     return 0;