[SCM] vlc/lucid: Refresh new patches.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the lucid branch:
commit ee102f7331eb011af76eee2513eb498c7ca0a044
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Mon Jan 24 23:01:15 2011 +0100

    Refresh new patches.

diff --git a/debian/patches/cdg-heap-overflow.diff b/debian/patches/cdg-heap-overflow.diff
index d04e283..924e72c 100644
--- a/debian/patches/cdg-heap-overflow.diff
+++ b/debian/patches/cdg-heap-overflow.diff
@@ -12,11 +12,9 @@ Subject: Fix heap overflows in CDG decoder
  does not break functionality.
 Origin: upstream, http://git.videolan.org/gitweb.cgi?p=vlc/vlc-1.1.git;a=commit;h=d11fca8bf9dc058bcdf67d81c04f84f8905ad8b4
 
-diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c
-index 31ecd0e..fe7b62d 100644
 --- a/modules/codec/cdg.c
 +++ b/modules/codec/cdg.c
-@@ -254,7 +254,13 @@ static int DecodeTileBlock( decoder_sys_t *p_cdg, const uint8_t *p_data, int doX
+@@ -255,7 +255,13 @@
          for( x = 0; x < 6; x++ )
          {
              const int idx = ( p_data[4+y] >> (5-x) ) & 0x01;
@@ -31,7 +29,7 @@ index 31ecd0e..fe7b62d 100644
              if( doXor )
                  *p ^= p_color[idx];
              else
-@@ -319,8 +325,8 @@ static int DecodeScroll( decoder_sys_t *p_cdg, const uint8_t *p_data, int b_copy
+@@ -320,8 +326,8 @@
  
              if( b_copy )
              {
diff --git a/debian/patches/xml-heap-corruption.diff b/debian/patches/xml-heap-corruption.diff
index 3858320..d3479a8 100644
--- a/debian/patches/xml-heap-corruption.diff
+++ b/debian/patches/xml-heap-corruption.diff
@@ -2,11 +2,9 @@ Author: Harry Sintonen <sintonen at iki.fi>
 Subject: Handle early termination properly in StripTags
 Origin: upstream, http://git.videolan.org/gitweb.cgi?p=vlc/vlc-1.1.git;a=commit;h=dc14617f39c03bbe80c3cc4f92799dca840966eb
 
-diff --git a/modules/codec/subtitles/subsdec.c b/modules/codec/subtitles/subsdec.c
-index 5c55a6e..bfdbb13 100644
 --- a/modules/codec/subtitles/subsdec.c
 +++ b/modules/codec/subtitles/subsdec.c
-@@ -632,6 +632,9 @@ static char *StripTags( char *psz_subtitle )
+@@ -618,6 +618,9 @@
              *psz_text++ = *psz_subtitle;
          }
  
@@ -16,11 +14,9 @@ index 5c55a6e..bfdbb13 100644
          psz_subtitle++;
      }
      *psz_text = '\0';
-diff --git a/modules/codec/subtitles/subsusf.c b/modules/codec/subtitles/subsusf.c
-index 5754137..fc1cf07 100644
 --- a/modules/codec/subtitles/subsusf.c
 +++ b/modules/codec/subtitles/subsusf.c
-@@ -1081,6 +1081,9 @@ static char *StripTags( char *psz_subtitle )
+@@ -1084,6 +1084,9 @@
              *psz_text++ = *psz_subtitle;
          }
  

-- 
VLC media player packaging