[SCM] handbrake/master: debian/patches: Refresh all patches.

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

The following commit has been merged in the master branch:
commit e5af44e1701082dc54599628c4eead14380d6dce
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Wed May 22 21:49:28 2013 -0300

    debian/patches: Refresh all patches.

diff --git a/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch b/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
index f8ee2c3..ae2cd18 100644
--- a/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
+++ b/debian/patches/0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
@@ -36,7 +36,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
  }
 --- a/libhb/muxmp4.c
 +++ b/libhb/muxmp4.c
-@@ -96,13 +96,13 @@
+@@ -100,13 +100,13 @@
      if (job->largeFileSize)
      /* Use 64-bit MP4 file */
      {
@@ -52,7 +52,7 @@ Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
      }
  
      if (m->file == MP4_INVALID_FILE_HANDLE)
-@@ -1373,14 +1373,14 @@
+@@ -1387,14 +1387,14 @@
              MP4TagsFree( tags );
          }
  
diff --git a/debian/patches/0010-Remove-FAAC-dependency.patch b/debian/patches/0010-Remove-FAAC-dependency.patch
index f4aa024..a105f7d 100644
--- a/debian/patches/0010-Remove-FAAC-dependency.patch
+++ b/debian/patches/0010-Remove-FAAC-dependency.patch
@@ -127,7 +127,7 @@ to enter Debian.
              *high = ((nchannels + lfe_count) *
 --- a/libhb/common.h
 +++ b/libhb/common.h
-@@ -948,7 +948,6 @@
+@@ -945,7 +945,6 @@
  extern hb_work_object_t hb_decavcodeca;
  extern hb_work_object_t hb_decavcodecv;
  extern hb_work_object_t hb_declpcm;
@@ -141,7 +141,7 @@ to enter Debian.
 +#if 0
  /* encfaac.c
  
-    Copyright (c) 2003-2012 HandBrake Team
+    Copyright (c) 2003-2013 HandBrake Team
 @@ -287,3 +288,4 @@
      return HB_WORK_OK;
  }
@@ -149,7 +149,7 @@ to enter Debian.
 +#endif /* 0 */
 --- a/libhb/hb.c
 +++ b/libhb/hb.c
-@@ -480,7 +480,6 @@
+@@ -487,7 +487,6 @@
  	hb_register( &hb_decavcodeca );
  	hb_register( &hb_decavcodecv );
  	hb_register( &hb_declpcm );
@@ -157,7 +157,7 @@ to enter Debian.
  	hb_register( &hb_enclame );
  	hb_register( &hb_encvorbis );
  	hb_register( &hb_muxer );
-@@ -581,7 +580,6 @@
+@@ -588,7 +587,6 @@
  	hb_register( &hb_decavcodeca );
  	hb_register( &hb_decavcodecv );
  	hb_register( &hb_declpcm );
@@ -167,7 +167,7 @@ to enter Debian.
  	hb_register( &hb_muxer );
 --- a/libhb/internal.h
 +++ b/libhb/internal.h
-@@ -411,7 +411,6 @@
+@@ -409,7 +409,6 @@
      WORK_DECAVCODEC,
      WORK_DECAVCODECV,
      WORK_DECLPCM,
@@ -204,7 +204,7 @@ to enter Debian.
              case HB_ACODEC_CA_HAAC:
 --- a/libhb/work.c
 +++ b/libhb/work.c
-@@ -143,7 +143,6 @@
+@@ -135,7 +135,6 @@
      switch (codec)
      {
          case HB_ACODEC_AC3:     return hb_get_work(WORK_ENCAVCODEC_AUDIO);
diff --git a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch b/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
index e2a2d2c..ed675c7 100644
--- a/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
+++ b/debian/patches/0011-First-try-at-removing-some-of-mp4v2.patch
@@ -11,8 +11,8 @@ Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
 +#if 0
  /* muxmp4.c
  
-    Copyright (c) 2003-2012 HandBrake Team
-@@ -1399,3 +1400,4 @@
+    Copyright (c) 2003-2013 HandBrake Team
+@@ -1413,3 +1414,4 @@
      return m;
  }
  
diff --git a/debian/patches/0014-Use-unpatched-a52.patch b/debian/patches/0014-Use-unpatched-a52.patch
index b8e97ff..944df0e 100644
--- a/debian/patches/0014-Use-unpatched-a52.patch
+++ b/debian/patches/0014-Use-unpatched-a52.patch
@@ -6,7 +6,7 @@ In upstream liba52, the state field is private.
 Forwarded: no
 --- a/libhb/deca52.c
 +++ b/libhb/deca52.c
-@@ -387,12 +387,15 @@ static hb_buffer_t* Decode(hb_work_objec
+@@ -387,12 +387,15 @@
                                                   pv->channel_layout,
                                                   pv->nchannels);
          }

-- 
handbrake packaging