[SCM] handbrake/master: debian/patches: Remove another unneeded patch.

rbrito-guest at users.alioth.debian.org rbrito-guest at users.alioth.debian.org
Thu Sep 26 14:39:06 UTC 2013


The following commit has been merged in the master branch:
commit 08acfb791164fc9aad718d6b3b82c3050ec0f253
Author: Rogério Brito <rbrito at ime.usp.br>
Date:   Thu Sep 26 11:38:46 2013 -0300

    debian/patches: Remove another unneeded patch.

diff --git a/debian/patches/0009-Remove-forcing-PGS-subtitles-to-be-included.patch b/debian/patches/0009-Remove-forcing-PGS-subtitles-to-be-included.patch
deleted file mode 100644
index 0fd5078..0000000
--- a/debian/patches/0009-Remove-forcing-PGS-subtitles-to-be-included.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: =?UTF-8?q?Rog=C3=A9rio=20Brito?= <rbrito at ime.usp.br>
-Date: Fri, 1 Jun 2012 23:53:42 -0300
-Subject: Remove forcing PGS subtitles to be included.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This needs a not-so short patch to libav/ffmpeg to be handled. I guess that
-the libraries aren't up to what the multimedia applications need.
-
-But then, I have *not* studied if the libraries offer any other, perhaps
-superior, alternative to what handbrake is doing here.
-
-Signed-off-by: Rogério Brito <rbrito at ime.usp.br>
----
- libhb/decpgssub.c |   12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
-diff --git a/libhb/decpgssub.c b/libhb/decpgssub.c
-index c5bb626..4b218ea 100644
---- a/libhb/decpgssub.c
-+++ b/libhb/decpgssub.c
-@@ -218,10 +218,6 @@ static int decsubWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
-             if (subtitle.num_rects != 0)
-             {
-                 w->subtitle->hits++;
--                if (subtitle.forced)
--                {
--                    w->subtitle->forced_hits++;
--                }
-             }
-             else
-             {
-@@ -234,13 +230,9 @@ static int decsubWork( hb_work_object_t * w, hb_buffer_t ** buf_in,
-             }
-             else if (w->subtitle->config.force)
-             {
--                useable_sub = subtitle.forced || pv->seen_forced_sub;
-+                useable_sub = pv->seen_forced_sub;
-                 // note if we find forced or empty subtitles
--                if (subtitle.forced)
--                {
--                    pv->seen_forced_sub = 1;
--                }
--                else if (!subtitle.num_rects)
-+                if (!subtitle.num_rects)
-                 {
-                     pv->seen_forced_sub = 0;
-                 }
--- 
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index 9bc122a..d599b22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,6 @@
 0003-Remove-embedded-downloaded-copies-of-various-librari.patch
 0004-Enable-compilation-on-Debian-arches-other-than-Linux.patch
 0005-libhb-Fix-compilation-with-mp4v2-v1.9.1.patch
-#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

-- 
handbrake packaging



More information about the pkg-multimedia-commits mailing list