[SCM] VLC media player packaging branch, sid, updated. debian/1.0.4-2-15-g69e2ca5
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Sat Feb 13 23:55:52 UTC 2010
The following commit has been merged in the sid branch:
commit efb822830bd2334afcbb7e95c39a214a2b22e9a2
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Sat Feb 13 15:50:35 2010 +0000
Refresh patches
diff --git a/debian/patches/052_as-needed.diff b/debian/patches/052_as-needed.diff
index c76aef5..d2cbec2 100644
--- a/debian/patches/052_as-needed.diff
+++ b/debian/patches/052_as-needed.diff
@@ -3,10 +3,10 @@ later libtool version
Index: vlc-debian/autotools/ltmain.sh
===================================================================
---- vlc-debian.orig/autotools/ltmain.sh 2009-07-09 00:21:18.000000000 +0200
-+++ vlc-debian/autotools/ltmain.sh 2009-07-09 00:23:16.000000000 +0200
-@@ -1807,6 +1807,11 @@
- arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+--- vlc-debian.orig/autotools/ltmain.sh 2010-02-13 15:44:10.000000000 +0000
++++ vlc-debian/autotools/ltmain.sh 2010-02-13 15:44:27.000000000 +0000
+@@ -4716,6 +4716,11 @@
+ arg=$func_stripname_result
;;
+ -Wl,--as-needed)
@@ -15,9 +15,9 @@ Index: vlc-debian/autotools/ltmain.sh
+ ;;
+
-Wl,*)
- args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- arg=
-@@ -2150,6 +2155,15 @@
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -5070,6 +5075,15 @@
lib=
found=no
case $deplib in
diff --git a/debian/patches/101_certificates_paths.diff b/debian/patches/101_certificates_paths.diff
index 32c2322..ca71d14 100644
--- a/debian/patches/101_certificates_paths.diff
+++ b/debian/patches/101_certificates_paths.diff
@@ -4,8 +4,8 @@ look for certificates
Index: vlc-debian/modules/misc/gnutls.c
===================================================================
---- vlc-debian.orig/modules/misc/gnutls.c 2009-07-09 00:21:18.000000000 +0200
-+++ vlc-debian/modules/misc/gnutls.c 2009-07-09 00:23:16.000000000 +0200
+--- vlc-debian.orig/modules/misc/gnutls.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/misc/gnutls.c 2010-02-13 15:44:27.000000000 +0000
@@ -698,6 +698,10 @@
sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
gnutls_Addx509File (VLC_OBJECT (p_session),
diff --git a/debian/patches/102_dejavu_font.diff b/debian/patches/102_dejavu_font.diff
index 75effa9..9180be8 100644
--- a/debian/patches/102_dejavu_font.diff
+++ b/debian/patches/102_dejavu_font.diff
@@ -2,9 +2,9 @@ Change the default font to one very likely to be present on a Debian box
Index: vlc-debian/modules/misc/freetype.c
===================================================================
---- vlc-debian.orig/modules/misc/freetype.c 2009-07-09 00:21:18.000000000 +0200
-+++ vlc-debian/modules/misc/freetype.c 2009-07-09 00:23:16.000000000 +0200
-@@ -60,7 +60,7 @@
+--- vlc-debian.orig/modules/misc/freetype.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/misc/freetype.c 2010-02-13 15:44:27.000000000 +0000
+@@ -64,7 +64,7 @@
#define DEFAULT_FONT "" /* Default font found at run-time */
#define FC_DEFAULT_FONT "Arial"
#else
diff --git a/debian/patches/104_notify.diff b/debian/patches/104_notify.diff
index 11e40a5..1441f91 100644
--- a/debian/patches/104_notify.diff
+++ b/debian/patches/104_notify.diff
@@ -4,8 +4,8 @@ so modify the code where needed.
Index: vlc-debian/modules/misc/notify/notify.c
===================================================================
---- vlc-debian.orig/modules/misc/notify/notify.c 2009-07-09 00:21:18.000000000 +0200
-+++ vlc-debian/modules/misc/notify/notify.c 2009-07-09 00:23:16.000000000 +0200
+--- vlc-debian.orig/modules/misc/notify/notify.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/misc/notify/notify.c 2010-02-13 15:44:27.000000000 +0000
@@ -231,12 +231,7 @@
else /* else we show state-of-the art logo */
{
diff --git a/debian/patches/200_osdmenu_paths.diff b/debian/patches/200_osdmenu_paths.diff
index fd13640..b41ddca 100644
--- a/debian/patches/200_osdmenu_paths.diff
+++ b/debian/patches/200_osdmenu_paths.diff
@@ -2,8 +2,8 @@ Use the installed files for osdmenu rather than the ones in the current dir
Index: vlc-debian/share/osdmenu/default.cfg
===================================================================
---- vlc-debian.orig/share/osdmenu/default.cfg 2009-07-09 00:21:18.000000000 +0200
-+++ vlc-debian/share/osdmenu/default.cfg 2009-07-09 00:23:16.000000000 +0200
+--- vlc-debian.orig/share/osdmenu/default.cfg 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/share/osdmenu/default.cfg 2010-02-13 15:44:27.000000000 +0000
@@ -1,4 +1,4 @@
-dir share/osdmenu/default
+dir /usr/share/vlc/osdmenu/default
@@ -12,8 +12,8 @@ Index: vlc-debian/share/osdmenu/default.cfg
select selection/play_pause.png
Index: vlc-debian/modules/video_filter/osdmenu.c
===================================================================
---- vlc-debian.orig/modules/video_filter/osdmenu.c 2009-07-09 00:21:18.000000000 +0200
-+++ vlc-debian/modules/video_filter/osdmenu.c 2009-07-09 00:23:16.000000000 +0200
+--- vlc-debian.orig/modules/video_filter/osdmenu.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/video_filter/osdmenu.c 2010-02-13 15:44:27.000000000 +0000
@@ -105,7 +105,7 @@
#if defined( WIN32 ) || defined( UNDER_CE )
#define OSD_DEFAULT_CFG "osdmenu/default.cfg"
diff --git a/debian/patches/300_manpage_syntax.diff b/debian/patches/300_manpage_syntax.diff
index 36bf955..05d2231 100644
--- a/debian/patches/300_manpage_syntax.diff
+++ b/debian/patches/300_manpage_syntax.diff
@@ -2,8 +2,8 @@ Add a note about the videolan-doc package (even if it's not really up-to-date)
Index: vlc-debian/doc/vlc.1
===================================================================
---- vlc-debian.orig/doc/vlc.1 2009-07-09 00:20:12.000000000 +0200
-+++ vlc-debian/doc/vlc.1 2009-07-09 00:23:16.000000000 +0200
+--- vlc-debian.orig/doc/vlc.1 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/vlc.1 2010-02-13 15:44:27.000000000 +0000
@@ -70,6 +70,11 @@
(close VLC).
diff --git a/debian/patches/401_i420_mmx_pic.diff b/debian/patches/401_i420_mmx_pic.diff
index a5085bc..7eb0418 100644
--- a/debian/patches/401_i420_mmx_pic.diff
+++ b/debian/patches/401_i420_mmx_pic.diff
@@ -5,8 +5,8 @@ Patch from upstream trac ticket #1383. Thanks to Gentoo and Alexis Ballier
Index: vlc-debian/modules/video_chroma/i420_rgb_mmx.h
===================================================================
---- vlc-debian.orig/modules/video_chroma/i420_rgb_mmx.h 2009-07-09 00:20:12.000000000 +0200
-+++ vlc-debian/modules/video_chroma/i420_rgb_mmx.h 2009-07-09 00:23:16.000000000 +0200
+--- vlc-debian.orig/modules/video_chroma/i420_rgb_mmx.h 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/video_chroma/i420_rgb_mmx.h 2010-02-13 15:44:27.000000000 +0000
@@ -34,18 +34,18 @@
#define USED_U64(foo) \
static const uint64_t foo __asm__ (#foo) __attribute__((unused))
diff --git a/debian/patches/501_decrease_alsa_buffer.diff b/debian/patches/501_decrease_alsa_buffer.diff
index e4c1383..b09c91c 100644
--- a/debian/patches/501_decrease_alsa_buffer.diff
+++ b/debian/patches/501_decrease_alsa_buffer.diff
@@ -2,9 +2,11 @@ Patch taken from http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=472811
also reported in ubuntu as lp #243152
---- a/modules/audio_output/alsa.c
-+++ b/modules/audio_output/alsa.c
-@@ -78,7 +78,7 @@ struct aout_sys_t
+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
diff --git a/debian/patches/502_fix_typo.patch b/debian/patches/502_fix_typo.patch
index a64de72..459957c 100644
--- a/debian/patches/502_fix_typo.patch
+++ b/debian/patches/502_fix_typo.patch
@@ -1,11 +1,11 @@
Description: Fix typos, that are reported by lintian.
Author: Benjamin Drung <bdrung at ubuntu.com>
Forwarded: no
-diff --git a/ChangeLog b/ChangeLog
-index 43f5a9b..1750a86 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -2557,7 +2557,7 @@ Date: Mon Sep 14 08:25:30 2009 +0200
+Index: vlc-debian/ChangeLog
+===================================================================
+--- vlc-debian.orig/ChangeLog 2010-02-13 15:44:10.000000000 +0000
++++ vlc-debian/ChangeLog 2010-02-13 15:44:27.000000000 +0000
+@@ -2746,7 +2746,7 @@
EPG: Don't display extra items from extended EIT events
Info they provide is typically also present in the text or
@@ -14,7 +14,7 @@ index 43f5a9b..1750a86 100644
(cherry picked from commit 235617299b975358d5eca95092faa43687a738b1)
commit 852533b7643d34abc6f81d33b6a03fa6ef5652a9
-@@ -15467,7 +15467,7 @@ commit d95bfc3f14f7590717ef68eaf4c58275fa633e2f
+@@ -15656,7 +15656,7 @@
Author: Rémi Duraffort <ivoire at videolan.org>
Date: Tue Mar 31 11:04:54 2009 +0200
@@ -23,11 +23,11 @@ index 43f5a9b..1750a86 100644
commit 9ad1dde84b96dbecbf3b26c311d52ce6aae43ddc
Author: Rémi Duraffort <ivoire at videolan.org>
-diff --git a/configure.ac b/configure.ac
-index 1702b68..bb26b95 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1693,7 +1693,7 @@ AS_IF([test "x${enable_debug}" = "xno"], [
+Index: vlc-debian/configure.ac
+===================================================================
+--- vlc-debian.orig/configure.ac 2010-02-13 15:44:10.000000000 +0000
++++ vlc-debian/configure.ac 2010-02-13 15:44:27.000000000 +0000
+@@ -1701,7 +1701,7 @@
])
dnl
@@ -36,11 +36,11 @@ index 1702b68..bb26b95 100644
dnl
AC_ARG_ENABLE(run-as-root,
[ --enable-run-as-root allow runing VLC as root (default disabled)])
-diff --git a/doc/ChangeLog-2000 b/doc/ChangeLog-2000
-index 90998a4..30f26ea 100644
---- a/doc/ChangeLog-2000
-+++ b/doc/ChangeLog-2000
-@@ -1857,7 +1857,7 @@ Date: Mon Mar 13 21:32:31 2000 +0000
+Index: vlc-debian/doc/ChangeLog-2000
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2000 2010-02-13 15:44:10.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2000 2010-02-13 15:44:27.000000000 +0000
+@@ -1857,7 +1857,7 @@
. gestion de la souris sous X (essentiellement le bouton du milieu
qui cache le pointeur, tr�s pratique quand on regarde un DVD)
. rajout de 3 fichiers d'installation pour le package Debian
@@ -49,11 +49,11 @@ index 90998a4..30f26ea 100644
le code parce que �a commen�ait � m'horripiler
. erreur de syntaxe dans la page de man.
. un peu plus de choses dans l'interface gnome, mais rien ne marche
-diff --git a/doc/ChangeLog-2001 b/doc/ChangeLog-2001
-index c1b9b05..bf8ec5c 100644
---- a/doc/ChangeLog-2001
-+++ b/doc/ChangeLog-2001
-@@ -4906,7 +4906,7 @@ Date: Wed Mar 7 00:18:46 2001 +0000
+Index: vlc-debian/doc/ChangeLog-2001
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2001 2010-02-13 15:44:10.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2001 2010-02-13 15:44:27.000000000 +0000
+@@ -4906,7 +4906,7 @@
Things to be done :
- Meuuh : fix the PCR synchronisation so that we can set b_pace_cntrol to 0
@@ -62,7 +62,7 @@ index c1b9b05..bf8ec5c 100644
moment, the "--input ts" always call input_NetworkOpen
- Maybe sam : for the moment the working syntax is vlc --input ts
servername, it should nbe turned into "vlc --server servername".
-@@ -5479,7 +5479,7 @@ Date: Sun Feb 18 01:42:05 2001 +0000
+@@ -5479,7 +5479,7 @@
related file with 100% reliability (great change that should make DVDs
with binaries and extra stuff work with vlc).
@@ -71,7 +71,7 @@ index c1b9b05..bf8ec5c 100644
video titles.
-Changed the method for selecting title at start. It is _not_ reliable
-@@ -5622,7 +5622,7 @@ Date: Tue Feb 13 10:08:51 2001 +0000
+@@ -5622,7 +5622,7 @@
detect size of some streams.
-change of the order of call to ifo and css functions in input_dvd.c,
@@ -80,7 +80,7 @@ index c1b9b05..bf8ec5c 100644
-changed location of some css tables.
-@@ -6084,7 +6084,7 @@ commit 32e82c69383d1685e5389e0f6f26c05e9b745714
+@@ -6084,7 +6084,7 @@
Author: Stéphane Borel <stef at videolan.org>
Date: Sun Jan 21 09:20:27 2001 +0000
@@ -89,11 +89,11 @@ index c1b9b05..bf8ec5c 100644
Now it generates a valid title key, but there is no sector descrambler
yet.
-diff --git a/doc/ChangeLog-2002 b/doc/ChangeLog-2002
-index 8378b3a..a876165 100644
---- a/doc/ChangeLog-2002
-+++ b/doc/ChangeLog-2002
-@@ -1173,7 +1173,7 @@ Author: Sigmund Augdal Helberg <sigmunau at videolan.org>
+Index: vlc-debian/doc/ChangeLog-2002
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2002 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2002 2010-02-13 15:44:27.000000000 +0000
+@@ -1173,7 +1173,7 @@
Date: Fri Dec 6 12:18:11 2002 +0000
some support for redirection. Moved the break on returncode >=400 to after
@@ -102,7 +102,7 @@ index 8378b3a..a876165 100644
http-passwd support
commit 79da01949bad2f111767fab3877b9f296084dfec
-@@ -1757,7 +1757,7 @@ commit 7af58f039fb38a61572b4e0d6ebd519d1d44c273
+@@ -1757,7 +1757,7 @@
Author: Simon Latapie <garf at videolan.org>
Date: Sat Nov 23 00:11:17 2002 +0000
@@ -111,7 +111,7 @@ index 8378b3a..a876165 100644
commit c06c5c0dd22ed02441cf10eb9c715ee9ecbb0947
Author: Sam Hocevar <sam at videolan.org>
-@@ -2054,7 +2054,7 @@ Date: Mon Nov 18 13:28:09 2002 +0000
+@@ -2054,7 +2054,7 @@
tree you want to use with --with-tarkin-tree=.
Warning: Tarkin is still in very early development stage, so this plugin isn't
@@ -120,7 +120,7 @@ index 8378b3a..a876165 100644
commit 7b872d1d463b789cc9442f126c34f616cbfaab3d
Author: Gildas Bazin <gbazin at videolan.org>
-@@ -2924,7 +2924,7 @@ Date: Sun Oct 27 23:10:19 2002 +0000
+@@ -2924,7 +2924,7 @@
* added a simple dialog to show id3-tags and other info
* finally added languages/subtitles selections menus, found and got fixed two
bugs in kdelibs in the process, but only one of them will get into kde 3.1.
@@ -129,7 +129,7 @@ index 8378b3a..a876165 100644
commit cdde2391932784c77a1b963e58af62aed850350c
Author: Laurent Aimar <fenrir at videolan.org>
-@@ -9571,7 +9571,7 @@ Author: Gildas Bazin <gbazin at videolan.org>
+@@ -9571,7 +9571,7 @@
Date: Mon Apr 1 21:39:17 2002 +0000
* Microsof Visual Studio C++ 6 project files.
@@ -138,7 +138,7 @@ index 8378b3a..a876165 100644
can't be compiled with msvc.
I won't be maintaining this msvc project as I don't have MSVC myself, but
-@@ -10287,7 +10287,7 @@ Date: Mon Mar 11 07:23:10 2002 +0000
+@@ -10287,7 +10287,7 @@
very welcome. And if there are GTK gurus out there, please don't hesitate to
add your touch.
@@ -147,11 +147,11 @@ index 8378b3a..a876165 100644
really good at this kind of thing so if people want to help, they can finish
the job. For this look at all the *_LONGTEXT macros at the top of main.c
-diff --git a/doc/ChangeLog-2003 b/doc/ChangeLog-2003
-index 94a0236..a81e4e0 100644
---- a/doc/ChangeLog-2003
-+++ b/doc/ChangeLog-2003
-@@ -4308,7 +4308,7 @@ commit 80646cc9b334bc68493679f4a7d293caeb445e3b
+Index: vlc-debian/doc/ChangeLog-2003
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2003 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2003 2010-02-13 15:44:27.000000000 +0000
+@@ -4308,7 +4308,7 @@
Author: Simon Latapie <garf at videolan.org>
Date: Mon Nov 3 03:21:38 2003 +0000
@@ -160,7 +160,7 @@ index 94a0236..a81e4e0 100644
* changed http interface more "neutral" colors
commit 6edaeb5f7049161ffa38ec995504292e7ca375f3
-@@ -4772,7 +4772,7 @@ Date: Mon Oct 27 22:42:02 2003 +0000
+@@ -4772,7 +4772,7 @@
* File tab is beginning to work
* Adding file to Playlist begins to work
@@ -169,7 +169,7 @@ index 94a0236..a81e4e0 100644
commit fe3f88cae034e66a540dd031bfe84c5ad53bd32e
Author: Gildas Bazin <gbazin at videolan.org>
-@@ -6966,7 +6966,7 @@ Date: Sun Sep 7 22:43:17 2003 +0000
+@@ -6966,7 +6966,7 @@
* libvlc: removed some unused options.
added sout-keep option to keep sout instance across playlist
@@ -178,7 +178,7 @@ index 94a0236..a81e4e0 100644
* stream_output : implement the sout-keep mode.
* playlist, video_output, stream_output: vout and sout are now reattached
to playlist instead of being destroyed. There are automatically destroy
-@@ -8468,7 +8468,7 @@ commit 77c1e95d10fe32171c3ebf3d7c6bd92bf54cf836
+@@ -8468,7 +8468,7 @@
Author: Laurent Aimar <fenrir at videolan.org>
Date: Mon Aug 4 18:50:36 2003 +0000
@@ -187,7 +187,7 @@ index 94a0236..a81e4e0 100644
commit b4bd21992f14b8d8e7854dd20b3bd05a12a8e250
Author: Jean-Paul Saman <jpsaman at videolan.org>
-@@ -8565,7 +8565,7 @@ Author: Benjamin Pracht <bigben at videolan.org>
+@@ -8565,7 +8565,7 @@
Date: Sat Aug 2 19:30:35 2003 +0000
* modules/access/http.c
@@ -196,7 +196,7 @@ index 94a0236..a81e4e0 100644
commit 952e0d06a479f1d118c06354ede5d7fd600aa417
Author: Laurent Aimar <fenrir at videolan.org>
-@@ -8631,7 +8631,7 @@ Date: Fri Aug 1 19:38:25 2003 +0000
+@@ -8631,7 +8631,7 @@
- bmin/bmax allow to create CBR stream.
- Bitrate is calculated on a PCR time.
- PCR delay cannot be less than length of a frame of the PCR stream.
@@ -205,7 +205,7 @@ index 94a0236..a81e4e0 100644
produce stream with smoother bitrate variation.
- Big PCR delay introduce more latency.
-@@ -8860,7 +8860,7 @@ commit 2ad6cb7f90d7398fd2a32a3756feacb6227861c6
+@@ -8860,7 +8860,7 @@
Author: Benjamin Pracht <bigben at videolan.org>
Date: Thu Jul 31 18:25:12 2003 +0000
@@ -214,7 +214,7 @@ index 94a0236..a81e4e0 100644
use :
-@@ -17139,7 +17139,7 @@ commit ae1b0c7f7a47e4dc822b0a7dab769f703a042c1e
+@@ -17139,7 +17139,7 @@
Author: Sigmund Augdal Helberg <sigmunau at videolan.org>
Date: Fri Mar 14 00:24:08 2003 +0000
@@ -223,7 +223,7 @@ index 94a0236..a81e4e0 100644
of capital letters
commit dc1750ae1d8d84893c9ab807d76ae29aa6a6a454
-@@ -19338,7 +19338,7 @@ Date: Fri Feb 7 01:22:55 2003 +0000
+@@ -19338,7 +19338,7 @@
* ffmpeg/audio : removed an old error (anyway it was harmless).
* mp4 : removed a bad initialisation. Erased all ending spaces.
@@ -232,7 +232,7 @@ index 94a0236..a81e4e0 100644
commit 0b8b405cbb0020e1ad51b5fa8cff197ae389e3a8
Author: Sam Hocevar <sam at videolan.org>
-@@ -21002,7 +21002,7 @@ Date: Wed Jan 22 22:19:29 2003 +0000
+@@ -21002,7 +21002,7 @@
added an new config variable that takes an comma separated list of
interface modules to be loaded in the background when vlc starts. This is
@@ -241,11 +241,11 @@ index 94a0236..a81e4e0 100644
module was inserted, as this just needs to be added to this list now.
commit 831d6ca51e9b135a0c05a9e2a73755cbad46f2ee
-diff --git a/doc/ChangeLog-2004 b/doc/ChangeLog-2004
-index 4823ce8..4bcdfa7 100644
---- a/doc/ChangeLog-2004
-+++ b/doc/ChangeLog-2004
-@@ -14513,7 +14513,7 @@ commit d947fa6036978d52408bd14c3875fefcd3581baf
+Index: vlc-debian/doc/ChangeLog-2004
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2004 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2004 2010-02-13 15:44:27.000000000 +0000
+@@ -14513,7 +14513,7 @@
Author: Benjamin Pracht <bigben at videolan.org>
Date: Mon Apr 19 11:50:51 2004 +0000
@@ -254,7 +254,7 @@ index 4823ce8..4bcdfa7 100644
commit 9dd393c7e2063c2368db6ff2be1b3a22ff6f8faf
Author: Gildas Bazin <gbazin at videolan.org>
-@@ -18876,7 +18876,7 @@ Author: Laurent Aimar <fenrir at videolan.org>
+@@ -18876,7 +18876,7 @@
Date: Wed Feb 11 19:17:14 2004 +0000
* all: added a "input-repeat" option that allow repeating the same entry
@@ -263,11 +263,11 @@ index 4823ce8..4bcdfa7 100644
( A value of -1 means repeat for ever).
--> Not tested with dvd.
-diff --git a/doc/ChangeLog-2005 b/doc/ChangeLog-2005
-index 9845204..54661a3 100644
---- a/doc/ChangeLog-2005
-+++ b/doc/ChangeLog-2005
-@@ -244,7 +244,7 @@ commit 3371c10fac67b86beb4867ddfd09a4e7a2caa52b
+Index: vlc-debian/doc/ChangeLog-2005
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2005 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2005 2010-02-13 15:44:27.000000000 +0000
+@@ -244,7 +244,7 @@
Author: Christophe Mutricy <xtophe at videolan.org>
Date: Sun Dec 18 12:01:15 2005 +0000
@@ -276,7 +276,7 @@ index 9845204..54661a3 100644
commit bff090425dc99534fd32d1da3cbba3174630ac7b
Author: Clément Stenac <zorglub at videolan.org>
-@@ -1200,7 +1200,7 @@ commit cca6fda35dc2cf6e2446e72a09eea71a33c1fc93
+@@ -1200,7 +1200,7 @@
Author: Antoine Cellerier <dionoea at videolan.org>
Date: Wed Dec 7 16:50:42 2005 +0000
@@ -285,7 +285,7 @@ index 9845204..54661a3 100644
i don't really know how i should handle it)
* add now playing info
-@@ -6840,7 +6840,7 @@ Date: Sat Sep 17 15:00:58 2005 +0000
+@@ -6840,7 +6840,7 @@
* don't print IPv6 unreachable warning when IPv4 works fine
* don't attempt SOCKS negociation when TCP connection failed
* use "%s port %d" rather than "%s:%d" because the latter is
@@ -294,7 +294,7 @@ index 9845204..54661a3 100644
* removed trailing spaces
commit 830c44d6e890c8873b1db87b3c581bf6d1c87856
-@@ -9332,7 +9332,7 @@ commit b0aaeaa099fcf4308d462e83c187f19734d8eb6b
+@@ -9332,7 +9332,7 @@
Author: Jean-Paul Saman <jpsaman at videolan.org>
Date: Sat Aug 13 13:49:04 2005 +0000
@@ -303,7 +303,7 @@ index 9845204..54661a3 100644
commit d4e7f95109c338b6cd8bf532e56fc9190855e32d
Author: Rémi Denis-Courmont <rem at videolan.org>
-@@ -18790,7 +18790,7 @@ Author: Derk-Jan Hartman <hartman at videolan.org>
+@@ -18790,7 +18790,7 @@
Date: Wed Mar 16 00:16:03 2005 +0000
* New ignore-filetypes option for the directory module.
@@ -312,7 +312,7 @@ index 9845204..54661a3 100644
playlist when the directory module parses directory contents.
This prevents duplication of playlist items (both m3u and the real files were being played, or both .bin and .cue were added, therfore playing the same movie twice) and the adding of items that are not really useful to VLC as seperate playlist items.
- By default are ignored the following: m3u,nfo,jpg,gif,sfv,txt,sub,idx,srt,cue
-@@ -22670,7 +22670,7 @@ commit 727e57b4c4a22a56e6b7d74542cd90b55f551bc0
+@@ -22670,7 +22670,7 @@
Author: Felix Paul Kühne <fkuehne at videolan.org>
Date: Mon Jan 3 23:01:42 2005 +0000
@@ -321,11 +321,11 @@ index 9845204..54661a3 100644
commit 49de1e5f11dfcfac939b147526f6f23880ddb169
Author: Felix Paul Kühne <fkuehne at videolan.org>
-diff --git a/doc/ChangeLog-2006 b/doc/ChangeLog-2006
-index 66705b6..399adc4 100644
---- a/doc/ChangeLog-2006
-+++ b/doc/ChangeLog-2006
-@@ -6771,7 +6771,7 @@ commit 7a5a63a7c0e59e4ab8471dfd4ad1da21a92ee34e
+Index: vlc-debian/doc/ChangeLog-2006
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2006 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2006 2010-02-13 15:44:27.000000000 +0000
+@@ -6771,7 +6771,7 @@
Author: Antoine Cellerier <dionoea at videolan.org>
Date: Sat Oct 14 17:06:38 2006 +0000
@@ -334,7 +334,7 @@ index 66705b6..399adc4 100644
commit 4963328e1199b46f65a3e1287358fc8e4ebec8b7
Author: Clément Stenac <zorglub at videolan.org>
-@@ -24021,7 +24021,7 @@ commit 822000a1057ddfcf707ae4305aac08c1acd00f1e
+@@ -24021,7 +24021,7 @@
Author: Antoine Cellerier <dionoea at videolan.org>
Date: Tue Jan 24 22:25:15 2006 +0000
@@ -343,11 +343,11 @@ index 66705b6..399adc4 100644
full of \n)
commit cf6397c80218c03632c80bcc7e55b130de40ab61
-diff --git a/doc/ChangeLog-2007 b/doc/ChangeLog-2007
-index 7a3fe7c..66f53a2 100644
---- a/doc/ChangeLog-2007
-+++ b/doc/ChangeLog-2007
-@@ -1072,7 +1072,7 @@ commit 2a51700499c574a0d5a4f28f1fe628227c558e40
+Index: vlc-debian/doc/ChangeLog-2007
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2007 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2007 2010-02-13 15:44:27.000000000 +0000
+@@ -1072,7 +1072,7 @@
Author: Jean-Baptiste Kempf <jb at videolan.org>
Date: Sat Dec 22 01:08:21 2007 +0000
@@ -356,7 +356,7 @@ index 7a3fe7c..66f53a2 100644
commit 3163d13850f96fe2f72144781551d85a305180c3
Author: Pierre d'Herbemont <pdherbemont at videolan.org>
-@@ -5130,7 +5130,7 @@ commit 5d12aaf8536f78a339abceede842f7c78536d670
+@@ -5130,7 +5130,7 @@
Author: Jean-Baptiste Kempf <jb at videolan.org>
Date: Tue Nov 13 04:58:42 2007 +0000
@@ -365,7 +365,7 @@ index 7a3fe7c..66f53a2 100644
commit a4fa3c64f29098e3e3342d2a693cd14cb8e613db
Author: Jean-Baptiste Kempf <jb at videolan.org>
-@@ -9696,7 +9696,7 @@ Date: Sat Sep 29 15:51:34 2007 +0000
+@@ -9696,7 +9696,7 @@
Fixed an overflow when more than MAX_SUBTITLE_FILES are detected.
Fixed a bunch of memory leaks.
Fixed removing sub/idx pair. (sizeof() != strlen on char*)
@@ -374,7 +374,7 @@ index 7a3fe7c..66f53a2 100644
Cosmetics
commit 3207d06be0213677ea21d8072ecda0b3e9aee6c6
-@@ -12214,7 +12214,7 @@ commit 30f60c2450957bc64ae3377d31352c85221dae3d
+@@ -12214,7 +12214,7 @@
Author: Jean-Baptiste Kempf <jb at videolan.org>
Date: Sun Sep 9 17:42:50 2007 +0000
@@ -383,7 +383,7 @@ index 7a3fe7c..66f53a2 100644
Patch by StFS - Stefán Freyr Stefánsson
commit af3f3a10a08be01da40d245496f9d3ec014aff8b
-@@ -12547,7 +12547,7 @@ commit 6275b728e24bb577a5dcfa61392f7335547f50b9
+@@ -12547,7 +12547,7 @@
Author: Jean-Baptiste Kempf <jb at videolan.org>
Date: Sat Sep 8 10:23:24 2007 +0000
@@ -392,7 +392,7 @@ index 7a3fe7c..66f53a2 100644
commit cd1ad0c30c82e11893b51a6493ff88e645844bae
Author: Rémi Denis-Courmont <rem at videolan.org>
-@@ -22003,7 +22003,7 @@ Date: Mon May 21 19:15:54 2007 +0000
+@@ -22003,7 +22003,7 @@
Reimplemented libvlc_vlm functions (untested)
Not yet implemented: libvlc_vlm_show_media and libvlc_vlm_get_media_title/chapter/seekable.
@@ -401,11 +401,11 @@ index 7a3fe7c..66f53a2 100644
commit 93dacf03bffa18dd131065f5271ca9ede6e961f7
Author: Damien Fouilleul <damienf at videolan.org>
-diff --git a/doc/ChangeLog-2008 b/doc/ChangeLog-2008
-index 7dfeee6..dc2d2db 100644
---- a/doc/ChangeLog-2008
-+++ b/doc/ChangeLog-2008
-@@ -13353,7 +13353,7 @@ Date: Sat Sep 6 00:55:44 2008 +0100
+Index: vlc-debian/doc/ChangeLog-2008
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2008 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2008 2010-02-13 15:44:27.000000000 +0000
+@@ -13353,7 +13353,7 @@
Add a small description
So that whatis is happy
@@ -414,7 +414,7 @@ index 7dfeee6..dc2d2db 100644
commit 0eb65558211e585e5aa7a468651be6d86cc8804e
Author: Christophe Mutricy <xtophe at videolan.org>
-@@ -25420,7 +25420,7 @@ commit 49f5d3b5a61528d57e8941c79a601651c821efe6
+@@ -25420,7 +25420,7 @@
Author: Laurent Aimar <fenrir at videolan.org>
Date: Sat Jul 5 18:42:02 2008 +0000
@@ -423,7 +423,7 @@ index 7dfeee6..dc2d2db 100644
commit e69ef5000b2b39ef65843a771f3dfeee52b2de7d
Author: Pierre d'Herbemont <pdherbemont at videolan.org>
-@@ -25938,7 +25938,7 @@ Date: Thu Jul 3 20:02:37 2008 +0100
+@@ -25938,7 +25938,7 @@
Soo that we avoid plugin cache problem between binary version.
@@ -432,7 +432,7 @@ index 7dfeee6..dc2d2db 100644
for all distros and for VideoLAN own win32 and MacOSX builds, I
think it has its place in the master tree.
-@@ -27378,7 +27378,7 @@ commit 16bf241c0ef8cb5ad5905817233af703080ed654
+@@ -27378,7 +27378,7 @@
Author: Jean-Baptiste Kempf <jb at videolan.org>
Date: Tue Jun 24 18:34:06 2008 -0700
@@ -441,11 +441,11 @@ index 7dfeee6..dc2d2db 100644
commit d79d5b339afb1310571a14579d66954dc12fb06d
Author: Christophe Mutricy <xtophe at videolan.org>
-diff --git a/doc/ChangeLog-2009 b/doc/ChangeLog-2009
-index ab652d3..ca7f4ba 100644
---- a/doc/ChangeLog-2009
-+++ b/doc/ChangeLog-2009
-@@ -2585,7 +2585,7 @@ Date: Mon Sep 14 08:25:30 2009 +0200
+Index: vlc-debian/doc/ChangeLog-2009
+===================================================================
+--- vlc-debian.orig/doc/ChangeLog-2009 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/doc/ChangeLog-2009 2010-02-13 15:44:27.000000000 +0000
+@@ -2746,7 +2746,7 @@
EPG: Don't display extra items from extended EIT events
Info they provide is typically also present in the text or
@@ -454,7 +454,7 @@ index ab652d3..ca7f4ba 100644
(cherry picked from commit 235617299b975358d5eca95092faa43687a738b1)
commit 852533b7643d34abc6f81d33b6a03fa6ef5652a9
-@@ -15495,7 +15495,7 @@ commit d95bfc3f14f7590717ef68eaf4c58275fa633e2f
+@@ -15656,7 +15656,7 @@
Author: Rémi Duraffort <ivoire at videolan.org>
Date: Tue Mar 31 11:04:54 2009 +0200
@@ -463,11 +463,11 @@ index ab652d3..ca7f4ba 100644
commit 9ad1dde84b96dbecbf3b26c311d52ce6aae43ddc
Author: Rémi Duraffort <ivoire at videolan.org>
-diff --git a/extras/package/rpm/vlc.fedora.spec b/extras/package/rpm/vlc.fedora.spec
-index 0573564..7bdf825 100644
---- a/extras/package/rpm/vlc.fedora.spec
-+++ b/extras/package/rpm/vlc.fedora.spec
-@@ -676,7 +676,7 @@ rm -rf $RPM_BUILD_ROOT __doc
+Index: vlc-debian/extras/package/rpm/vlc.fedora.spec
+===================================================================
+--- vlc-debian.orig/extras/package/rpm/vlc.fedora.spec 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/extras/package/rpm/vlc.fedora.spec 2010-02-13 15:44:27.000000000 +0000
+@@ -676,7 +676,7 @@
- Add BR directfb-devel (wip)
- Add BR libnotify-devel
- Enabled --enable-speex
@@ -476,7 +476,7 @@ index 0573564..7bdf825 100644
- Enabled --enable-pda
- Testing --enable-directfb (wip)
- Removed patch5 (was format.c)
-@@ -684,7 +684,7 @@ rm -rf $RPM_BUILD_ROOT __doc
+@@ -684,7 +684,7 @@
* Thu Apr 5 2007 kwizart < kwizart at gmail.com > - 0.8.6a-5
- Use system ffmpeg lib (pth and libtool seems to be incompatible with it)
- Dirac seem to compile fine but testing usability for now.
@@ -485,7 +485,7 @@ index 0573564..7bdf825 100644
- Exclude %%{_bindir}/vlcwrapper.py? since this is the guideline about python for now.
* Mon Apr 2 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.6
-@@ -699,7 +699,7 @@ rm -rf $RPM_BUILD_ROOT __doc
+@@ -699,7 +699,7 @@
- Clean up svn to release changes
* Tue Mar 22 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.4
@@ -494,11 +494,11 @@ index 0573564..7bdf825 100644
* Wed Mar 21 2007 kwizart < kwizart at gmail.com > - 0.8.6a-4.3
- Revert back to the static vlc version
-diff --git a/modules/access/http.c b/modules/access/http.c
-index 71a6fc7..b8ff044 100644
---- a/modules/access/http.c
-+++ b/modules/access/http.c
-@@ -1699,7 +1699,7 @@ static char *AuthGetParamNoQuotes( const char *psz_header, const char *psz_param
+Index: vlc-debian/modules/access/http.c
+===================================================================
+--- vlc-debian.orig/modules/access/http.c 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/modules/access/http.c 2010-02-13 15:44:27.000000000 +0000
+@@ -1701,7 +1701,7 @@
static void AuthParseHeader( access_t *p_access, const char *psz_header,
http_auth_t *p_auth )
{
@@ -507,11 +507,11 @@ index 71a6fc7..b8ff044 100644
/* 2 Basic Authentication Scheme */
if( !strncasecmp( psz_header, "Basic ", strlen( "Basic " ) ) )
-diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c
-index 48097e8..3f65e60 100644
---- a/modules/audio_output/directx.c
-+++ b/modules/audio_output/directx.c
-@@ -1051,7 +1051,7 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame,
+Index: vlc-debian/modules/audio_output/directx.c
+===================================================================
+--- vlc-debian.orig/modules/audio_output/directx.c 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/modules/audio_output/directx.c 2010-02-13 15:44:27.000000000 +0000
+@@ -1051,7 +1051,7 @@
p_notif->i_frame_size, /* Number of bytes */
&p_write_position, /* Address of lock start */
&l_bytes1, /* Count of bytes locked before wrap around */
@@ -520,11 +520,11 @@ index 48097e8..3f65e60 100644
&l_bytes2, /* Count of bytes after wrap around */
0 ); /* Flags */
if( dsresult == DSERR_BUFFERLOST )
-diff --git a/modules/codec/cmml/cmml.c b/modules/codec/cmml/cmml.c
-index 76020a2..2e2d6a7 100644
---- a/modules/codec/cmml/cmml.c
-+++ b/modules/codec/cmml/cmml.c
-@@ -105,7 +105,7 @@ static int OpenDecoder( vlc_object_t *p_this )
+Index: vlc-debian/modules/codec/cmml/cmml.c
+===================================================================
+--- vlc-debian.orig/modules/codec/cmml/cmml.c 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/modules/codec/cmml/cmml.c 2010-02-13 15:44:27.000000000 +0000
+@@ -105,7 +105,7 @@
/* Let other interested modules know that we're a CMML decoder
* We have to set this variable on the input thread, because there's
* typically more than one decoder running so we can't find the CMML
@@ -533,11 +533,11 @@ index 76020a2..2e2d6a7 100644
* this would be rather appreciated ;) */
p_input = vlc_object_find( p_dec, VLC_OBJECT_INPUT, FIND_ANYWHERE );
if( p_input )
-diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
-index d6a5109..150c06d 100644
---- a/modules/demux/mkv/matroska_segment.cpp
-+++ b/modules/demux/mkv/matroska_segment.cpp
-@@ -733,7 +733,7 @@ bool matroska_segment_c::Select( mtime_t i_start_time )
+Index: vlc-debian/modules/demux/mkv/matroska_segment.cpp
+===================================================================
+--- vlc-debian.orig/modules/demux/mkv/matroska_segment.cpp 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/demux/mkv/matroska_segment.cpp 2010-02-13 15:44:27.000000000 +0000
+@@ -733,7 +733,7 @@
}
else
{
@@ -546,11 +546,11 @@ index d6a5109..150c06d 100644
}
}
else {
-diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
-index d4e4170..932ae30 100644
---- a/modules/demux/mp4/libmp4.c
-+++ b/modules/demux/mp4/libmp4.c
-@@ -2036,7 +2036,7 @@ static int MP4_ReadBox_cmov( stream_t *p_stream, MP4_Box_t *p_box )
+Index: vlc-debian/modules/demux/mp4/libmp4.c
+===================================================================
+--- vlc-debian.orig/modules/demux/mp4/libmp4.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/demux/mp4/libmp4.c 2010-02-13 15:44:27.000000000 +0000
+@@ -2036,7 +2036,7 @@
p_cmvd->data.p_cmvd->p_data = p_data;
p_cmvd->data.p_cmvd->b_compressed = 0;
@@ -559,11 +559,11 @@ index d4e4170..932ae30 100644
/* now create a memory stream */
p_stream_memory =
-diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
-index 28ed463..0daa1e5 100644
---- a/modules/demux/mp4/mp4.c
-+++ b/modules/demux/mp4/mp4.c
-@@ -490,7 +490,7 @@ static int Open( vlc_object_t * p_this )
+Index: vlc-debian/modules/demux/mp4/mp4.c
+===================================================================
+--- vlc-debian.orig/modules/demux/mp4/mp4.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/demux/mp4/mp4.c 2010-02-13 15:44:27.000000000 +0000
+@@ -490,7 +490,7 @@
p_sys->p_tref_chap = p_chap;
}
@@ -572,11 +572,11 @@ index 28ed463..0daa1e5 100644
for( i = 0; i < p_sys->i_tracks; i++ )
{
p_trak = MP4_BoxGet( p_sys->p_root, "/moov/trak[%d]", i );
-diff --git a/modules/demux/ts.c b/modules/demux/ts.c
-index 4814864..3ffd2dd 100644
---- a/modules/demux/ts.c
-+++ b/modules/demux/ts.c
-@@ -3562,7 +3562,7 @@ static void PMTSetupEs0x06( demux_t *p_demux, ts_pid_t *pid,
+Index: vlc-debian/modules/demux/ts.c
+===================================================================
+--- vlc-debian.orig/modules/demux/ts.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/demux/ts.c 2010-02-13 15:44:27.000000000 +0000
+@@ -3562,7 +3562,7 @@
}
#ifdef _DVBPSI_DR_52_H_
@@ -585,10 +585,10 @@ index 4814864..3ffd2dd 100644
if( PMTEsFindDescriptor( p_es, 0x52 ) )
{
dvbpsi_descriptor_t *p_dr = PMTEsFindDescriptor( p_es, 0x52 );
-diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
-index dc17db5..b8e2cf5 100644
---- a/modules/gui/macosx/playlist.m
-+++ b/modules/gui/macosx/playlist.m
+Index: vlc-debian/modules/gui/macosx/playlist.m
+===================================================================
+--- vlc-debian.orig/modules/gui/macosx/playlist.m 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/gui/macosx/playlist.m 2010-02-13 15:44:27.000000000 +0000
@@ -673,7 +673,7 @@
[self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO];
}
@@ -598,11 +598,11 @@ index dc17db5..b8e2cf5 100644
already selected node */
- (void)removeItemsFrom:(id)o_items ifChildrenOf:(id)o_nodes
{
-diff --git a/modules/gui/qt4/components/controller.hpp b/modules/gui/qt4/components/controller.hpp
-index 8aff5b2..f32efb1 100644
---- a/modules/gui/qt4/components/controller.hpp
-+++ b/modules/gui/qt4/components/controller.hpp
-@@ -159,8 +159,8 @@ protected slots:
+Index: vlc-debian/modules/gui/qt4/components/controller.hpp
+===================================================================
+--- vlc-debian.orig/modules/gui/qt4/components/controller.hpp 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/gui/qt4/components/controller.hpp 2010-02-13 15:44:27.000000000 +0000
+@@ -159,8 +159,8 @@
virtual void setStatus( int );
signals:
@@ -613,11 +613,11 @@ index 8aff5b2..f32efb1 100644
void inputIsRecordable( bool ); /// same ?
void inputIsTrickPlayable( bool ); /// same ?
void sizeChanged();
-diff --git a/modules/video_filter/atmo/AtmoCalculations.cpp b/modules/video_filter/atmo/AtmoCalculations.cpp
-index 92179d5..2797da8 100644
---- a/modules/video_filter/atmo/AtmoCalculations.cpp
-+++ b/modules/video_filter/atmo/AtmoCalculations.cpp
-@@ -137,7 +137,7 @@ tColorPacket CalcColorsAnalyzeHSV(CAtmoConfig *pAtmoConfig, tHSVColor *HSV_Img)
+Index: vlc-debian/modules/video_filter/atmo/AtmoCalculations.cpp
+===================================================================
+--- vlc-debian.orig/modules/video_filter/atmo/AtmoCalculations.cpp 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/video_filter/atmo/AtmoCalculations.cpp 2010-02-13 15:44:27.000000000 +0000
+@@ -137,7 +137,7 @@
// windowing from -hue_windowsize -> +hue_windowsize
for (int mywin = -hue_windowsize; mywin < hue_windowsize+1; mywin++)
{
@@ -626,7 +626,7 @@ index 92179d5..2797da8 100644
int myidx = i + mywin;
// handle beginning of windowing -> roll back
-@@ -243,7 +243,7 @@ tColorPacket CalcColorsAnalyzeHSV(CAtmoConfig *pAtmoConfig, tHSVColor *HSV_Img)
+@@ -243,7 +243,7 @@
// windowing from -hue_windowsize -> +hue_windowsize
for (int mywin = -sat_windowsize; mywin < sat_windowsize+1; mywin++)
{
@@ -635,11 +635,11 @@ index 92179d5..2797da8 100644
int myidx = i + mywin;
// handle beginning of windowing -> roll back
-diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
-index a8e9edd..0b527bb 100644
---- a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
-+++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
-@@ -443,7 +443,7 @@ static int exec_DataSharedMem( filter_t *p_filter,
+Index: vlc-debian/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
+===================================================================
+--- vlc-debian.orig/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c 2010-02-13 15:44:27.000000000 +0000
+@@ -443,7 +443,7 @@
if( (p_params->i_height != 1) || (p_params->i_width < 1) )
{
msg_Err( p_filter,
@@ -648,11 +648,11 @@ index a8e9edd..0b527bb 100644
"must be 1 and width the number of bytes in the string, "
"including the null terminator" );
return VLC_EGENERIC;
-diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
-index 47a102f..ae19945 100644
---- a/modules/video_output/fb.c
-+++ b/modules/video_output/fb.c
-@@ -160,13 +160,13 @@ struct vout_sys_t
+Index: vlc-debian/modules/video_output/fb.c
+===================================================================
+--- vlc-debian.orig/modules/video_output/fb.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/video_output/fb.c 2010-02-13 15:44:27.000000000 +0000
+@@ -160,13 +160,13 @@
vlc_fourcc_t i_chroma;
/* Video memory */
@@ -668,11 +668,11 @@ index 47a102f..ae19945 100644
};
/*****************************************************************************
-diff --git a/modules/video_output/omapfb.c b/modules/video_output/omapfb.c
-index 7590abb..d2201a9 100644
---- a/modules/video_output/omapfb.c
-+++ b/modules/video_output/omapfb.c
-@@ -153,8 +153,8 @@ struct vout_sys_t
+Index: vlc-debian/modules/video_output/omapfb.c
+===================================================================
+--- vlc-debian.orig/modules/video_output/omapfb.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/video_output/omapfb.c 2010-02-13 15:44:27.000000000 +0000
+@@ -153,8 +153,8 @@
picture_t *p_output_picture;
/* Video memory */
@@ -683,11 +683,11 @@ index 7590abb..d2201a9 100644
size_t i_page_size; /* page size */
int i_bytes_per_pixel; /* Bytes used by one pixel */
int i_line_len; /* Length of one line in bytes */
-diff --git a/modules/visualization/galaktos/parser.c b/modules/visualization/galaktos/parser.c
-index b1028f3..51322ba 100644
---- a/modules/visualization/galaktos/parser.c
-+++ b/modules/visualization/galaktos/parser.c
-@@ -1233,7 +1233,7 @@ per_frame_eqn_t * parse_per_frame_eqn(FILE * fs, int index, struct PRESET_T * pr
+Index: vlc-debian/modules/visualization/galaktos/parser.c
+===================================================================
+--- vlc-debian.orig/modules/visualization/galaktos/parser.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/visualization/galaktos/parser.c 2010-02-13 15:44:27.000000000 +0000
+@@ -1233,7 +1233,7 @@
return NULL;
}
@@ -696,7 +696,7 @@ index b1028f3..51322ba 100644
return per_frame_eqn;
}
-@@ -1281,7 +1281,7 @@ per_frame_eqn_t * parse_implicit_per_frame_eqn(FILE * fs, char * param_string, i
+@@ -1281,7 +1281,7 @@
return NULL;
}
@@ -705,7 +705,7 @@ index b1028f3..51322ba 100644
return per_frame_eqn;
}
-@@ -2112,6 +2112,6 @@ int get_string_prefix_len(char * string) {
+@@ -2112,6 +2112,6 @@
if (string[i] == 0)
return FAILURE;
@@ -713,11 +713,11 @@ index b1028f3..51322ba 100644
+ /* Finished successfully, return the length */
return i;
}
-diff --git a/modules/visualization/galaktos/preset.c b/modules/visualization/galaktos/preset.c
-index 7b01d7d..68cd733 100644
---- a/modules/visualization/galaktos/preset.c
-+++ b/modules/visualization/galaktos/preset.c
-@@ -732,7 +732,7 @@ void reloadPerFrame(char * s, preset_t * preset) {
+Index: vlc-debian/modules/visualization/galaktos/preset.c
+===================================================================
+--- vlc-debian.orig/modules/visualization/galaktos/preset.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/modules/visualization/galaktos/preset.c 2010-02-13 15:44:27.000000000 +0000
+@@ -732,7 +732,7 @@
preset->per_frame_eqn_string_index = slen;
/* Finished */
@@ -726,11 +726,11 @@ index 7b01d7d..68cd733 100644
return;
}
-diff --git a/share/lua/README.txt b/share/lua/README.txt
-index 1048176..e50fa78 100644
---- a/share/lua/README.txt
-+++ b/share/lua/README.txt
-@@ -5,7 +5,7 @@ $Id$
+Index: vlc-debian/share/lua/README.txt
+===================================================================
+--- vlc-debian.orig/share/lua/README.txt 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/share/lua/README.txt 2010-02-13 15:44:27.000000000 +0000
+@@ -5,7 +5,7 @@
=============
Lua documenation is available on http://www.lua.org . The reference manual
@@ -739,7 +739,7 @@ index 1048176..e50fa78 100644
VLC uses Lua 5.1
All the Lua standard libraries are available.
-@@ -96,7 +96,7 @@ misc.configdir(): Get the user's VLC config directory.
+@@ -96,7 +96,7 @@
misc.cachedir(): Get the user's VLC cache directory.
misc.datadir_list( name ): FIXME: write description ... or ditch function
@@ -748,11 +748,11 @@ index 1048176..e50fa78 100644
misc.mdate(): Get the current date (in milliseconds).
misc.mwait(): Wait for the given date (in milliseconds).
-diff --git a/share/lua/intf/modules/common.lua b/share/lua/intf/modules/common.lua
-index f0a1aa2..a4ac28e 100644
---- a/share/lua/intf/modules/common.lua
-+++ b/share/lua/intf/modules/common.lua
-@@ -57,7 +57,7 @@ function table_print(t,prefix)
+Index: vlc-debian/share/lua/intf/modules/common.lua
+===================================================================
+--- vlc-debian.orig/share/lua/intf/modules/common.lua 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/share/lua/intf/modules/common.lua 2010-02-13 15:44:27.000000000 +0000
+@@ -57,7 +57,7 @@
end
-- print the list of callbacks registered in lua
@@ -761,11 +761,11 @@ index f0a1aa2..a4ac28e 100644
function print_callbacks()
print "callbacks:"
table_print(vlc.callbacks)
-diff --git a/share/lua/intf/modules/host.lua b/share/lua/intf/modules/host.lua
-index 82867f6..0a64b70 100644
---- a/share/lua/intf/modules/host.lua
-+++ b/share/lua/intf/modules/host.lua
-@@ -27,7 +27,7 @@ Example use:
+Index: vlc-debian/share/lua/intf/modules/host.lua
+===================================================================
+--- vlc-debian.orig/share/lua/intf/modules/host.lua 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/share/lua/intf/modules/host.lua 2010-02-13 15:44:27.000000000 +0000
+@@ -27,7 +27,7 @@
require "host"
h = host.host()
@@ -774,11 +774,11 @@ index 82867f6..0a64b70 100644
function on_password( client )
client:switch_status( host.status.read )
end
-diff --git a/share/lua/intf/telnet.lua b/share/lua/intf/telnet.lua
-index 2f7bd3f..3ffd7e0 100644
---- a/share/lua/intf/telnet.lua
-+++ b/share/lua/intf/telnet.lua
-@@ -58,7 +58,7 @@ function on_password( client )
+Index: vlc-debian/share/lua/intf/telnet.lua
+===================================================================
+--- vlc-debian.orig/share/lua/intf/telnet.lua 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/share/lua/intf/telnet.lua 2010-02-13 15:44:27.000000000 +0000
+@@ -58,7 +58,7 @@
if client.type == host.client_type.net then
client:send( "Password: " ..IAC..WILL..ECHO )
else
@@ -787,11 +787,11 @@ index 2f7bd3f..3ffd7e0 100644
client:switch_status( host.status.read )
end
end
-diff --git a/src/input/stream_filter.c b/src/input/stream_filter.c
-index 63d535a..bcbcb32 100644
---- a/src/input/stream_filter.c
-+++ b/src/input/stream_filter.c
-@@ -103,7 +103,7 @@ stream_t *stream_FilterChainNew( stream_t *p_source,
+Index: vlc-debian/src/input/stream_filter.c
+===================================================================
+--- vlc-debian.orig/src/input/stream_filter.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/src/input/stream_filter.c 2010-02-13 15:44:27.000000000 +0000
+@@ -103,7 +103,7 @@
}
free( psz_tmp );
@@ -800,11 +800,11 @@ index 63d535a..bcbcb32 100644
if( b_record )
{
stream_t *p_filter = stream_FilterNew( p_source,
-diff --git a/src/network/tcp.c b/src/network/tcp.c
-index d06dcbd..43f2b53 100644
---- a/src/network/tcp.c
-+++ b/src/network/tcp.c
-@@ -422,7 +422,7 @@ static int SocksNegotiate( vlc_object_t *p_obj,
+Index: vlc-debian/src/network/tcp.c
+===================================================================
+--- vlc-debian.orig/src/network/tcp.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/src/network/tcp.c 2010-02-13 15:44:27.000000000 +0000
+@@ -422,7 +422,7 @@
msg_Err( p_obj, "socks: unsupported authentication method %x",
buffer[0] );
else
@@ -813,11 +813,11 @@ index d06dcbd..43f2b53 100644
return VLC_EGENERIC;
}
-diff --git a/src/stream_output/sap.c b/src/stream_output/sap.c
-index b5f9165..31aa193 100644
---- a/src/stream_output/sap.c
-+++ b/src/stream_output/sap.c
-@@ -369,7 +369,7 @@ int SAP_Add (sap_handler_t *p_sap, session_descriptor_t *p_session)
+Index: vlc-debian/src/stream_output/sap.c
+===================================================================
+--- vlc-debian.orig/src/stream_output/sap.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/src/stream_output/sap.c 2010-02-13 15:44:27.000000000 +0000
+@@ -369,7 +369,7 @@
/* SAPv1, not encrypted, not compressed */
psz_head[0] = 0x20;
@@ -826,11 +826,11 @@ index b5f9165..31aa193 100644
i_hash = mdate();
psz_head[2] = i_hash >> 8; /* Msg id hash */
-diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
-index b9b0b8e..39fb879 100644
---- a/src/video_output/video_output.c
-+++ b/src/video_output/video_output.c
-@@ -891,7 +891,7 @@ static int InitThread( vout_thread_t *p_vout )
+Index: vlc-debian/src/video_output/video_output.c
+===================================================================
+--- vlc-debian.orig/src/video_output/video_output.c 2010-02-13 15:44:12.000000000 +0000
++++ vlc-debian/src/video_output/video_output.c 2010-02-13 15:44:27.000000000 +0000
+@@ -891,7 +891,7 @@
PictureHeapFixRgb( &p_vout->output );
VideoFormatImportRgb( &p_vout->fmt_out, &p_vout->output );
diff --git a/debian/patches/503_jack_input.diff b/debian/patches/503_jack_input.diff
index 02622be..239d294 100644
--- a/debian/patches/503_jack_input.diff
+++ b/debian/patches/503_jack_input.diff
@@ -28,15 +28,16 @@ The attached patch fixes this problem. It's been already fixed the same
Signed-off-by: Christophe Mutricy <xtophe at videolan.org>
-diff --git a/modules/access/jack.c b/modules/access/jack.c
-index 217b6e4..1e08c4c 100644
---- a/modules/access/jack.c
-+++ b/modules/access/jack.c
-@@ -444,7 +444,7 @@ int Process( jack_nframes_t i_frames, void *p_arg )
- }
+Index: vlc-debian/modules/access/jack.c
+===================================================================
+--- vlc-debian.orig/modules/access/jack.c 2010-02-13 15:44:11.000000000 +0000
++++ vlc-debian/modules/access/jack.c 2010-02-13 15:44:27.000000000 +0000
+@@ -405,7 +405,7 @@
+ es_out_Send( p_demux->out, p_es, p_block );
}
-
+
- return 1;
+ return 0;
}
-
+
+
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list