From 89cf5bf39a915f480cd03797366760e4e1afd493 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 30 May 2012 15:27:42 +0200 Subject: cmdutils: replace 1 line #ifs by if() Signed-off-by: Michael Niedermayer --- cmdutils.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'cmdutils.c') diff --git a/cmdutils.c b/cmdutils.c index 9b908f5316..95fa901942 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -65,13 +65,13 @@ static FILE *report_file; void init_opts(void) { -#if CONFIG_SWSCALE - sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC, + + if(CONFIG_SWSCALE) + sws_opts = sws_getContext(16, 16, 0, 16, 16, 0, SWS_BICUBIC, NULL, NULL, NULL); -#endif -#if CONFIG_SWRESAMPLE - swr_opts = swr_alloc(); -#endif + + if(CONFIG_SWRESAMPLE) + swr_opts = swr_alloc(); } void uninit_opts(void) @@ -80,9 +80,10 @@ void uninit_opts(void) sws_freeContext(sws_opts); sws_opts = NULL; #endif -#if CONFIG_SWRESAMPLE - swr_free(&swr_opts); -#endif + + if(CONFIG_SWRESAMPLE) + swr_free(&swr_opts); + av_dict_free(&format_opts); av_dict_free(&codec_opts); } -- cgit v1.2.3