[arch-commits] Commit in handbrake/trunk (2 files)

[Evangelos Foutras]

    Date: Wednesday, December 28, 2016 @ 05:49:22
  Author: foutrelis
Revision: 203158

upgpkg: handbrake 1.0.0-2

Fix crash during 2-pass encodes (FS#52279).

Added:
  handbrake/trunk/handbarke-fix-crash-during-2-pass-encode.patch
Modified:
  handbrake/trunk/PKGBUILD

------------------------------------------------+
 PKGBUILD                                       |    7 +++++
 handbarke-fix-crash-during-2-pass-encode.patch |   27 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-12-28 05:47:53 UTC (rev 203157)
+++ PKGBUILD	2016-12-28 05:49:22 UTC (rev 203158)
@@ -5,7 +5,7 @@
 
 pkgname=('handbrake' 'handbrake-cli')
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="https://handbrake.fr/"
 license=('GPL')
@@ -15,13 +15,18 @@
              'libtheora' 'libsamplerate' 'ffmpeg' 'x264' 'libx264' 'x265'
              'libvpx' 'libdvdnav' 'jansson' 'librsvg' 'libgudev')
 source=(https://handbrake.fr/mirror/HandBrake-$pkgver.tar.bz2
+        handbarke-fix-crash-during-2-pass-encode.patch
         handbrake-fix-missing-x265-link-flag.patch)
 sha256sums=('15fb4593c70d75621212e4499f018c3c93d7ce39f1083bf527d4616ded0044c5'
+            'aaa09e9b3dbad54024f02afe8ace5390b281c7cc6aae80cf26d43f773b2d19f7'
             '05e212e76b6e0b94a04de02cbeb7bf9db607059e19297b5bd3d0d143135285c4')
 
 prepare() {
   cd "$srcdir/HandBrake-$pkgver"
 
+  # https://github.com/HandBrake/HandBrake/commit/e159ab1662ba#commitcomment-20303756
+  patch -Np1 -i ../handbarke-fix-crash-during-2-pass-encode.patch
+
   # https://bugs.gentoo.org/show_bug.cgi?id=552792
   patch -Np1 -i ../handbrake-fix-missing-x265-link-flag.patch
 

Added: handbarke-fix-crash-during-2-pass-encode.patch
===================================================================
--- handbarke-fix-crash-during-2-pass-encode.patch	                        (rev 0)
+++ handbarke-fix-crash-during-2-pass-encode.patch	2016-12-28 05:49:22 UTC (rev 203158)
@@ -0,0 +1,27 @@
+From 3b9c9a263f7ffa959d56d914c62df18c9567c0db Mon Sep 17 00:00:00 2001
+From: John Stebbins <jstebbins.hb at gmail.com>
+Date: Tue, 27 Dec 2016 08:56:25 -0800
+Subject: [PATCH] encavcodec: fix crash during 2 pass encode
+
+This affect mpeg4, mpeg2, vp8 and vp9 encoding
+---
+ libhb/encavcodec.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libhb/encavcodec.c b/libhb/encavcodec.c
+index d7a751e..0543fe4 100644
+--- a/libhb/encavcodec.c
++++ b/libhb/encavcodec.c
+@@ -352,10 +352,10 @@ int encavcodecInit( hb_work_object_t * w, hb_job_t * job )
+     }
+ 
+     if (job->pass_id == HB_PASS_ENCODE_1ST &&
+-        pv->context->stats_out != NULL)
++        context->stats_out != NULL)
+     {
+         // Some encoders may write stats during init in avcodec_open
+-        fprintf(pv->file, "%s", pv->context->stats_out);
++        fprintf(pv->file, "%s", context->stats_out);
+     }
+ 
+     // avcodec_open populates the opts dictionary with the