[SCM] libav/experimental: move freeing code before exiting because of signal

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5973490a8f2a95766731715a87fa4379e761905a
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Mon Apr 13 03:47:12 2009 +0000

    move freeing code before exiting because of signal
    
    Originally committed as revision 18485 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index e908561..feb1b2d 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;
 }

-- 
Libav/FFmpeg packaging