[SCM] handbrake/master: update 0014-Use-unpatched-a52.patch to unbreak compilation with unpatched liba52

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bb23323cb21118088b7f05d56dbac9ce5d35b321
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 16 09:49:29 2013 +0100

    update 0014-Use-unpatched-a52.patch to unbreak compilation with unpatched liba52

diff --git a/debian/patches/0014-Use-unpatched-a52.patch b/debian/patches/0014-Use-unpatched-a52.patch
index 134e0bd..b8e97ff 100644
--- a/debian/patches/0014-Use-unpatched-a52.patch
+++ b/debian/patches/0014-Use-unpatched-a52.patch
@@ -1,19 +1,24 @@
-Author: Rogério Theodoro de Brito <rbrito at ime.usp.br>
+Author: Reinhard Tartler <siretart at tauware.de>
 Description: Use unpatched a52
- We don't have liba52 patched to support the A52_USE_DPLII macro,
- so we ignore it for the moment.
+
+In upstream liba52, the state field is private.
 
 Forwarded: no
-Last-Update: 2012-06-15
-Signed-off-by: Rogério Theodoro de Brito <rbrito at ime.usp.br>
 --- a/libhb/deca52.c
 +++ b/libhb/deca52.c
-@@ -109,7 +109,7 @@
-             break;
- 
-         case HB_AMIXDOWN_DOLBYPLII:
--            pv->flags_out = ( A52_DOLBY | A52_USE_DPLII );
-+            pv->flags_out = A52_DOLBY;
-             break;
- 
-         case HB_AMIXDOWN_DOLBY:
+@@ -387,12 +387,15 @@ static hb_buffer_t* Decode(hb_work_objec
+                                                  pv->channel_layout,
+                                                  pv->nchannels);
+         }
++#if 0
++        // FIXME: debian uses an unpatched liba52
+         if (pv->use_mix_levels)
+         {
+             hb_audio_resample_set_mix_levels(pv->resample,
+                                              (double)pv->state->slev,
+                                              (double)pv->state->clev);
+         }
++#endif
+         if (hb_audio_resample_update(pv->resample))
+         {
+             hb_log("deca52: hb_audio_resample_update() failed");
diff --git a/debian/patches/series b/debian/patches/series
index 28372a8..7345288 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,7 @@
 #0009-Remove-forcing-PGS-subtitles-to-be-included.patch
 0010-Remove-FAAC-dependency.patch
 0011-First-try-at-removing-some-of-mp4v2.patch
-#0014-Use-unpatched-a52.patch
+0014-Use-unpatched-a52.patch
 #0015-use-metadata-reading-from-libav.patch
 0016-use-older-libmkv.patch
 0017-fixup-libmkv.patch

-- 
handbrake packaging