[SCM] vlc/master: Refresh patches and drop backported VideoLAN-SA-1103.patch.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ee1939563548178be9c50c77061c2aaf1ebf49ce
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Apr 13 16:28:36 2011 +0200

    Refresh patches and drop backported VideoLAN-SA-1103.patch.

diff --git a/debian/patches/052_as-needed.patch b/debian/patches/052_as-needed.patch
index 31ae1ae..c6e5895 100644
--- a/debian/patches/052_as-needed.patch
+++ b/debian/patches/052_as-needed.patch
@@ -3,7 +3,7 @@ Bug-Debian: http://bugs.debian.org/347650
 
 --- a/autotools/ltmain.sh
 +++ b/autotools/ltmain.sh
-@@ -5041,6 +5041,11 @@
+@@ -5787,6 +5787,11 @@
  	arg=$func_stripname_result
  	;;
  
@@ -15,7 +15,7 @@ Bug-Debian: http://bugs.debian.org/347650
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -5397,6 +5402,15 @@
+@@ -6150,6 +6155,15 @@
  	lib=
  	found=no
  	case $deplib in
diff --git a/debian/patches/VideoLAN-SA-1103.patch b/debian/patches/VideoLAN-SA-1103.patch
deleted file mode 100644
index 666de28..0000000
--- a/debian/patches/VideoLAN-SA-1103.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Subject  MP4: fix heap-based buffer overflow
-Author: Rémi Denis-Courmont <remi at remlab.net>
-Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commit;h=5637ca8141bf39f263ecdb62035d2cb45c740821
-
-diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
-index b6f860f..7eb900a 100644
---- a/modules/demux/mp4/libmp4.c
-+++ b/modules/demux/mp4/libmp4.c
-@@ -2247,7 +2247,7 @@ static int MP4_ReadBox_frma( stream_t *p_stream, MP4_Box_t *p_box )
- 
- static int MP4_ReadBox_skcr( stream_t *p_stream, MP4_Box_t *p_box )
- {
--    MP4_READBOX_ENTER( MP4_Box_data_frma_t );
-+    MP4_READBOX_ENTER( MP4_Box_data_skcr_t );
- 
-     MP4_GET4BYTES( p_box->data.p_skcr->i_init );
-     MP4_GET4BYTES( p_box->data.p_skcr->i_encr );
diff --git a/debian/patches/series b/debian/patches/series
index fe9a3eb..ac233f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 052_as-needed.patch
 200_osdmenu_paths.patch
 xulrunner-1.9.1.patch
-VideoLAN-SA-1103.patch
diff --git a/debian/patches/xulrunner-1.9.1.patch b/debian/patches/xulrunner-1.9.1.patch
index 998f094..5256542 100644
--- a/debian/patches/xulrunner-1.9.1.patch
+++ b/debian/patches/xulrunner-1.9.1.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/configure
 +++ b/configure
-@@ -47504,9 +47504,9 @@
+@@ -48354,9 +48354,9 @@
            if test -n "$i"
            then
              echo "Trying to find $i package" >&5
@@ -17,7 +17,7 @@ Forwarded: not-needed
              then
                echo "Using $i pkg-config package." >&5
                echo "Using $i package." >&6
-@@ -47734,7 +47734,7 @@
+@@ -48584,7 +48584,7 @@
  done
  test -n "$MOZILLA_CONFIG" || MOZILLA_CONFIG="no"
  
@@ -28,7 +28,7 @@ Forwarded: not-needed
  fi
 --- a/configure.ac
 +++ b/configure.ac
-@@ -4556,8 +4556,8 @@
+@@ -4562,8 +4562,8 @@
            if test -n "$i"
            then
              echo "Trying to find $i package" >&AS_MESSAGE_LOG_FD

-- 
VLC media player packaging