[SCM] Emulator of the Super Nintendo Entertainment System (TM) branch, master, updated. debian/1.510+bz2-3-10-gb504edb

[Etienne Millon]

The following commit has been merged in the master branch:
commit c10323160bf480d45bec901519c29de61385e962
Author: Etienne Millon <me at emillon.org>
Date:   Mon Jul 2 20:54:01 2012 +0200

    Amend patch to zero memory

diff --git a/debian/changelog b/debian/changelog
index a0abf6d..ea3bb96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ zsnes (1.510+bz2-4) UNRELEASED; urgency=low
   * Disable build on amd64 (Closes: #679526, #672935)
     - Add Multi-Arch: Foreign
   * Add patch to initialize the ao_sample_format structure
-    (thanks to Fabian Greffrath - Closes: #679826)
+    (thanks to Fabian Greffrath & Goswin von Brederlow - Closes: #679826)
   * debian/compat : use level 9 compatibility level
   * debian/rules :
     - use find -delete instead of shell globbing
diff --git a/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch b/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch
index 6865f1f..feeec00 100644
--- a/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch
+++ b/debian/patches/0014-Initialize-driver_format.matrix-with-NULL.patch
@@ -4,14 +4,19 @@ Subject: Initialize driver_format.matrix with NULL;
 
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679826
 ---
- src/linux/audio.c |    1 +
- 1 file changed, 1 insertion(+)
+ src/linux/audio.c |    2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/src/linux/audio.c b/src/linux/audio.c
-index 985855c..bebf159 100644
+index 985855c..06ea851 100644
 --- a/src/linux/audio.c
 +++ b/src/linux/audio.c
-@@ -170,6 +170,7 @@ static int SoundInit_ao()
+@@ -166,10 +166,12 @@ static int SoundInit_ao()
+   if (driver_id < 0) { driver_id = ao_default_driver_id(); }
+ 
+   ao_sample_format driver_format;
++  memset(&driver_format, 0, sizeof(driver_format));
+   driver_format.bits = 16;
    driver_format.channels = StereoSound+1;
    driver_format.rate = freqtab[SoundQuality = ((SoundQuality > 6) ? 1 : SoundQuality)];
    driver_format.byte_format = AO_FMT_LITTLE;

-- 
Emulator of the Super Nintendo Entertainment System (TM)