summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2011-02-04 17:58:03 -0800
committerRonald S. Bultje <rsbultje@gmail.com>2011-02-05 17:18:45 -0500
commit3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2 (patch)
treeab588e6a6a85dac4f769cd36102c43e5794588d5
parent6b474953975fd8ea64d1ed4d09c42b2d8e787c6f (diff)
downloadffmpeg-streaming-3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2.zip
ffmpeg-streaming-3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2.tar.gz
cmdutils: fix opt_values leak
Add free to uninit_opts and relocate opt_names to same Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
-rw-r--r--cmdutils.c2
-rw-r--r--ffmpeg.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/cmdutils.c b/cmdutils.c
index 58fe85c..99e4c38 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -78,6 +78,8 @@ void uninit_opts(void)
#if CONFIG_SWSCALE
av_freep(&sws_opts);
#endif
+ av_freep(&opt_names);
+ av_freep(&opt_values);
}
void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)
diff --git a/ffmpeg.c b/ffmpeg.c
index 371ccd2..f78e658 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -524,7 +524,6 @@ static int ffmpeg_exit(int ret)
fclose(vstats_file);
av_free(vstats_filename);
- av_free(opt_names);
av_free(streamid_map);
av_free(input_codecs);
av_free(output_codecs);
OpenPOWER on IntegriCloud