summaryrefslogtreecommitdiff
authorStefano Sabatini <stefasab@gmail.com>2013-10-17 14:52:02 (GMT)
committer Stefano Sabatini <stefasab@gmail.com>2013-10-17 16:02:54 (GMT)
commit98e7c1eed5593ee65741b62969bb105fc1608d0f (patch)
tree74ff2f91394d7a8ba668e63a658e81b33d1da6ea
parentd0a3bc13025baab8d48cbcf4c698daf2f0c44adc (diff)
downloadffmpeg-98e7c1eed5593ee65741b62969bb105fc1608d0f.zip
ffmpeg-98e7c1eed5593ee65741b62969bb105fc1608d0f.tar.gz
ffmpeg-98e7c1eed5593ee65741b62969bb105fc1608d0f.tar.bz2
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.
Diffstat
-rw-r--r--libavutil/opt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavutil/opt.c b/libavutil/opt.c
index c035307..d282af2 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;