From 98e7c1eed5593ee65741b62969bb105fc1608d0f Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Thu, 17 Oct 2013 16:52:02 +0200 Subject: [PATCH] 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. --- libavutil/opt.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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;