From: Stefano Sabatini <stefasab@gmail.com>
Date: Thu, 17 Oct 2013 14:52:02 +0000 (+0200)
Subject: lavu/opt-test: use automatic set and free handlers
X-Git-Tag: android-x86-4.4-r1~543
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=98e7c1eed5593ee65741b62969bb105fc1608d0f;p=android-x86%2Fexternal-ffmpeg.git

lavu/opt-test: use automatic set and free handlers

In particular, do not set default string value by hand and use
av_opt_free() to free context.
---

diff --git a/libavutil/opt.c b/libavutil/opt.c
index c035307053..d282af2f29 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -1559,7 +1559,7 @@ int main(void)
                 av_log(&test_ctx, AV_LOG_ERROR, "Error setting options string: '%s'\n", options[i]);
             printf("\n");
         }
-        av_freep(&test_ctx.string);
+        av_opt_free(&test_ctx);
     }
 
     printf("\nTesting av_opt_set_from_string()\n");
@@ -1580,7 +1580,6 @@ int main(void)
 
         test_ctx.class = &test_class;
         av_opt_set_defaults(&test_ctx);
-        test_ctx.string = av_strdup("default");
 
         av_log_set_level(AV_LOG_DEBUG);
 
@@ -1590,7 +1589,7 @@ int main(void)
                 av_log(&test_ctx, AV_LOG_ERROR, "Error setting options string: '%s'\n", options[i]);
             printf("\n");
         }
-        av_freep(&test_ctx.string);
+        av_opt_free(&test_ctx);
     }
 
     return 0;