[SCM] libav/experimental: Original Commit: r25 | ods15 | 2006-09-22 14:06:04 +0300 (Fri, 22 Sep 2006) | 2 lines

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ae9b187ab2595e2d4de4af3e17103353b741f8a4
Author: Oded Shimon <ods15 at ods15.dyndns.org>
Date:   Mon Oct 2 05:56:01 2006 +0000

    Original Commit: r25 | ods15 | 2006-09-22 14:06:04 +0300 (Fri, 22 Sep 2006) | 2 lines
    
    add proper uninit/free to all vorbis encoder context
    
    Originally committed as revision 6436 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/vorbis_enc.c b/libavcodec/vorbis_enc.c
index 5501041..528edc6 100644
--- a/libavcodec/vorbis_enc.c
+++ b/libavcodec/vorbis_enc.c
@@ -560,6 +560,39 @@ static int vorbis_encode_frame(AVCodecContext * avccontext, unsigned char * pack
 static int vorbis_encode_close(AVCodecContext * avccontext)
 {
     venc_context_t * venc = avccontext->priv_data;
+    int i;
+
+    if (venc->codebooks) for (i = 0; i < venc->ncodebooks; i++) {
+        av_freep(&venc->codebooks[i].entries);
+        av_freep(&venc->codebooks[i].quantlist);
+        av_freep(&venc->codebooks[i].dimentions);
+    }
+    av_freep(&venc->codebooks);
+
+    if (venc->floors) for (i = 0; i < venc->nfloors; i++) {
+        int j;
+        av_freep(&venc->floors[i].classes);
+        if (venc->floors[i].classes)
+            for (j = 0; j < venc->floors[i].nclasses; j++)
+                av_freep(&venc->floors[i].classes[j].books);
+        av_freep(&venc->floors[i].partition_to_class);
+        av_freep(&venc->floors[i].list);
+    }
+    av_freep(&venc->floors);
+
+    if (venc->residues) for (i = 0; i < venc->nresidues; i++) {
+        av_freep(&venc->residues[i].books);
+    }
+    av_freep(&venc->residues);
+
+    if (venc->mappings) for (i = 0; i < venc->nmappings; i++) {
+        av_freep(&venc->mappings[i].mux);
+        av_freep(&venc->mappings[i].floor);
+        av_freep(&venc->mappings[i].residue);
+    }
+    av_freep(&venc->mappings);
+
+    av_freep(&venc->modes);
 
     av_freep(&avccontext->coded_frame);
     av_freep(&avccontext->extradata);

-- 
Libav/FFmpeg packaging