summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg/A06-mkv-default-subtitle.patch
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-01-12 21:48:54 +0000
committerjstebbins <[email protected]>2014-01-12 21:48:54 +0000
commitd69e6b4612a40ba2a4714ac8e02a9b4fea6bb03c (patch)
treed51d1d3b5f01a2ea27b97c2eed8ddc26865ec333 /contrib/ffmpeg/A06-mkv-default-subtitle.patch
parenta42fd932a3fdc837bd7d7c8d83f7f0a335f18ce7 (diff)
bump libav, libav-v10_alpha1-90-g63debaa
Adds interlaced VC1 and HEVC support. Eliminates the need for most of our local patches. Many assorted bug fixes and improvements. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5962 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/A06-mkv-default-subtitle.patch')
-rw-r--r--contrib/ffmpeg/A06-mkv-default-subtitle.patch30
1 files changed, 0 insertions, 30 deletions
diff --git a/contrib/ffmpeg/A06-mkv-default-subtitle.patch b/contrib/ffmpeg/A06-mkv-default-subtitle.patch
deleted file mode 100644
index 9074a3443..000000000
--- a/contrib/ffmpeg/A06-mkv-default-subtitle.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f1febbdddc573c7684e1761abfe568ebfcfcdcd1 Mon Sep 17 00:00:00 2001
-From: John Stebbins <[email protected]>
-Date: Fri, 10 May 2013 08:49:58 -0700
-Subject: [PATCH 3/9] matroskaenc: Fix writing TRACKDEFAULTFLAG
-
-The element was only being written when the value == 1. But the default
-value of this element is 1, so this has no useful effect. This element
-needs to be written when the value == 0.
----
- libavformat/matroskaenc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
-index 4858af5..358ba66 100644
---- a/libavformat/matroskaenc.c
-+++ b/libavformat/matroskaenc.c
-@@ -568,7 +568,9 @@ static int mkv_write_tracks(AVFormatContext *s)
- tag = av_dict_get(st->metadata, "language", NULL, 0);
- put_ebml_string(pb, MATROSKA_ID_TRACKLANGUAGE, tag ? tag->value:"und");
-
-- if (st->disposition)
-+ // The default value for TRACKFLAGDEFAULT is 1, so add element
-+ // if we need to clear it.
-+ if (!(st->disposition & AV_DISPOSITION_DEFAULT))
- put_ebml_uint(pb, MATROSKA_ID_TRACKFLAGDEFAULT, !!(st->disposition & AV_DISPOSITION_DEFAULT));
-
- // look for a codec ID string specific to mkv to use,
---
-1.8.1.4
-