diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-28 01:47:05 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-28 01:48:22 +0400 |
| commit | 8381ab143779d25611a1bb05d674bc39fe940f77 (patch) | |
| tree | 74773be2c947475433dcc47898aec49a0c4b198b /cmdutils.c | |
| parent | b8773e44d56667edea2d68d067d0c156522ca304 (diff) | |
| parent | 79aeade6f6f8fbd7ce1da619fdd475e5db88ae24 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
ARM: disable ff_vector_fmul_vfp on VFPv3 systems
ARM: check for VFPv3
swscale: Remove unused variables in x86 code.
doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS.
x86: Add appropriate ifdefs around certain AVX functions.
cmdutils: use sws_freeContext() instead of av_freep().
swscale: delay allocation of formatConvBuffer().
swscale: fix build with --disable-swscale-alpha.
movenc: Deprecate the global RTP hinting flag, use a private AVOption instead
movenc: Add an AVClass for setting muxer specific options
swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
configure: report yasm/nasm presence properly
tcp: make connect() timeout properly
rawdec: factor video demuxer definitions into a macro.
rtspdec: add initial_pause private option.
lavf: deprecate AVFormatParameters.width/height.
tty: add video_size private option.
rawdec: add video_size private option.
x11grab: add video_size private option.
x11grab: factorize returning error codes.
...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c index 8265fbcd0f..8c9542accb 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -76,7 +76,8 @@ void uninit_opts(void) av_freep(&avformat_opts->key); av_freep(&avformat_opts); #if CONFIG_SWSCALE - av_freep(&sws_opts); + sws_freeContext(sws_opts); + sws_opts = NULL; #endif for (i = 0; i < opt_name_count; i++) { av_freep(&opt_names[i]); |