diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 15:27:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 15:45:05 +0200 |
| commit | 89cf5bf39a915f480cd03797366760e4e1afd493 (patch) | |
| tree | 4a18238a6d2d6d7ebb0e016bf544ae9e05584ad5 /cmdutils.c | |
| parent | bf6fb563b99f3dc4586a8b9ee7578d3cc1a341fa (diff) | |
| download | ffmpeg-89cf5bf39a915f480cd03797366760e4e1afd493.tar.gz | |
cmdutils: replace 1 line #ifs by if()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 19 |
1 files changed, 10 insertions, 9 deletions
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); } |