[SCM] audacity/master: Fix crash on WMA export (LP: #695648).

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit add674ef4be4d141360254aa26b2fa45b4161384
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Mar 9 11:58:26 2011 +0100

    Fix crash on WMA export (LP: #695648).

diff --git a/debian/patches/fix-wma-export-crash.patch b/debian/patches/fix-wma-export-crash.patch
new file mode 100644
index 0000000..ffaf69c
--- /dev/null
+++ b/debian/patches/fix-wma-export-crash.patch
@@ -0,0 +1,24 @@
+Description: Fix crash on WMA export.
+Author: Leland Lucius <leland at audacityteam.org>
+Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=274
+Bug-Ubuntu: https://launchpad.net/bugs/695648
+
+--- audacity-1.3.12.orig/src/export/ExportFFmpeg.cpp
++++ audacity-1.3.12/src/export/ExportFFmpeg.cpp
+@@ -615,13 +615,13 @@ bool ExportFFmpeg::Finalize()
+       }
+    }
+ 
++   // Write any file trailers.
++   FFMPEG_LIB(av_write_trailer(mEncFormatCtx));
++
+    // Close the codecs.
+    if (mEncAudioStream != NULL)
+       FFMPEG_LIB(avcodec_close(mEncAudioStream->codec));
+ 
+-   // Write any file trailers.
+-   FFMPEG_LIB(av_write_trailer(mEncFormatCtx));
+-
+    for (i = 0; i < (int)mEncFormatCtx->nb_streams; i++)
+    {
+       FFMPEG_LIB(av_freep(&mEncFormatCtx->streams[i]->codec));
diff --git a/debian/patches/series b/debian/patches/series
index 50460bd..69b7c09 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,5 +8,6 @@ fix-const-char-conversion.patch
 system-portaudio.patch
 portmixer-include-directory.patch
 soundtouch-pkgconfig-file.patch
+fix-wma-export-crash.patch
 autoreconf.patch
 configure.patch

-- 
Audacity debian packaging