[SCM] VLC media player packaging branch, sid, updated. debian/1.1.2-1-7-ga9d6c07

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the sid branch:
commit 77f8a378bdee4d0028fc6ea060eba7ad5074ca19
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Aug 18 04:20:02 2010 +0200

    Drop 501_decrease_alsa_buffer.diff. The pulseaudio output module has a higher priority than the ALSA output plugin and should be used on pulseaudio systems.

diff --git a/debian/patches/501_decrease_alsa_buffer.diff b/debian/patches/501_decrease_alsa_buffer.diff
deleted file mode 100644
index c1bf13d..0000000
--- a/debian/patches/501_decrease_alsa_buffer.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Decrease alsa buffer size. That improves the behaviour of the alsa
- output module on pulseaudio system. But note that vlc-plugin-pulse provides a
- native pulseaudio output module.
-Author: Reinhard Tartler <siretart at tauware.de>
-Bug-Debian: http://bugs.debian.org/472811
-Bug-Ubuntu: https://launchpad.net/bugs/243152
-
-Index: vlc-debian/modules/audio_output/alsa.c
-===================================================================
---- vlc-debian.orig/modules/audio_output/alsa.c	2010-02-13 15:44:11.000000000 +0000
-+++ vlc-debian/modules/audio_output/alsa.c	2010-02-13 15:44:27.000000000 +0000
-@@ -78,7 +78,7 @@
-    number of channel(s) (eg. 2 for stereo) and the size of a sample (eg.
-    2 for int16_t). */
- #define ALSA_DEFAULT_PERIOD_SIZE        1024
--#define ALSA_DEFAULT_BUFFER_SIZE        ( ALSA_DEFAULT_PERIOD_SIZE << 8 )
-+#define ALSA_DEFAULT_BUFFER_SIZE        ( ALSA_DEFAULT_PERIOD_SIZE << 4 )
- #define ALSA_SPDIF_PERIOD_SIZE          A52_FRAME_NB
- #define ALSA_SPDIF_BUFFER_SIZE          ( ALSA_SPDIF_PERIOD_SIZE << 4 )
- /* Why << 4 ? --Meuuh */
diff --git a/debian/patches/series b/debian/patches/series
index b319008..8601b24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 052_as-needed.diff
 104_notify.diff
 200_osdmenu_paths.diff
-501_decrease_alsa_buffer.diff
 502_xulrunner_191.diff
 503_autoreconf.diff
 CVE-2010-2937.patch

-- 
VLC media player packaging