From: jstebbins <jstebbins.hb@gmail.com>
Date: Fri, 26 Sep 2014 15:10:28 +0000 (+0000)
Subject: contrib: add patch to unbreak sbtl writing in mp4
X-Git-Tag: 0.10.0~111
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=87dd6af3e61522537d7bdd8ab19f83eef846e0cc;p=handbrake

contrib: add patch to unbreak sbtl writing in mp4

This was fixed a while ago in libav, but I forgot to add to our patches


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6420 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/contrib/ffmpeg/A08-movenc-unbreak-sbtl.patch b/contrib/ffmpeg/A08-movenc-unbreak-sbtl.patch
new file mode 100644
index 000000000..8ac7ea997
--- /dev/null
+++ b/contrib/ffmpeg/A08-movenc-unbreak-sbtl.patch
@@ -0,0 +1,27 @@
+commit f94371b1db89bf65173a763a49175ce549466602
+Author: Michael Niedermayer <michaelni@gmx.at>
+Date:   Sat Mar 29 15:56:03 2014 +0100
+
+    mov: Unbreak sbtl writing
+
+diff --git a/libavformat/movenc.c b/libavformat/movenc.c
+index a6a55d5..889f15c 100644
+--- a/libavformat/movenc.c
++++ b/libavformat/movenc.c
+@@ -1312,9 +1312,13 @@ static int mov_write_hdlr_tag(AVIOContext *pb, MOVTrack *track)
+             hdlr_type = "soun";
+             descr     = "SoundHandler";
+         } else if (track->enc->codec_type == AVMEDIA_TYPE_SUBTITLE) {
+-            if (track->tag == MKTAG('t','x','3','g')) hdlr_type = "sbtl";
+-            if (track->tag == MKTAG('m','p','4','s')) hdlr_type = "subp";
+-            else                                      hdlr_type = "text";
++            if (track->tag == MKTAG('t','x','3','g')) {
++                hdlr_type = "sbtl";
++            } else if (track->tag == MKTAG('m','p','4','s')) {
++                hdlr_type = "subp";
++            } else {
++                hdlr_type = "text";
++            }
+             descr = "SubtitleHandler";
+         } else if (track->enc->codec_tag == MKTAG('r','t','p',' ')) {
+             hdlr_type = "hint";