aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-04-13 03:47:12 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2009-04-13 03:47:12 +0000
commit5973490a8f2a95766731715a87fa4379e761905a (patch)
tree51c96c6baf93607f68927236145228b7e0e2cef8
parent3b801075962b3295739ec4286d6326c84c0779e3 (diff)
downloadffmpeg-5973490a8f2a95766731715a87fa4379e761905a.tar.gz
move freeing code before exiting because of signal
Originally committed as revision 18485 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index e908561d79..feb1b2d760 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -427,6 +427,11 @@ static int av_exit(int ret)
powerpc_display_perf_report();
#endif /* CONFIG_POWERPC_PERF */
+ for (i=0;i<CODEC_TYPE_NB;i++)
+ av_free(avcodec_opts[i]);
+ av_free(avformat_opts);
+ av_free(sws_opts);
+
if (received_sigterm) {
fprintf(stderr,
"Received signal %d: terminating.\n",
@@ -434,11 +439,6 @@ static int av_exit(int ret)
exit (255);
}
- for (i=0;i<CODEC_TYPE_NB;i++)
- av_free(avcodec_opts[i]);
- av_free(avformat_opts);
- av_free(sws_opts);
-
exit(ret); /* not all OS-es handle main() return value */
return ret;
}