aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2012-12-29 16:13:33 +0100
committerJoakim Plate <elupus@ecce.se>2012-12-29 16:13:33 +0100
commit5ea54214e1e8c355a0b90cfd7dae805f10f1cf10 (patch)
tree9d9d537e5509110602e21bf3ab46e634fa6440b9
parent0f4032b941563789a073b9d66a31dcb06086a33c (diff)
ffmpeg: added patch for supporting S_DVBSUB's in MKV as stored by tvheadend
-rw-r--r--lib/ffmpeg/patches/0035-ffmpeg-fixed-missing-S_DVBSUB-subtitles.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/lib/ffmpeg/patches/0035-ffmpeg-fixed-missing-S_DVBSUB-subtitles.patch b/lib/ffmpeg/patches/0035-ffmpeg-fixed-missing-S_DVBSUB-subtitles.patch
new file mode 100644
index 0000000000..506655b3b3
--- /dev/null
+++ b/lib/ffmpeg/patches/0035-ffmpeg-fixed-missing-S_DVBSUB-subtitles.patch
@@ -0,0 +1,24 @@
+From 9066d83f0f237d90fe0c2d9b6202bb8cd59a6562 Mon Sep 17 00:00:00 2001
+From: Allan Kristensen <allank@tigerdyr.com>
+Date: Fri, 21 Dec 2012 21:04:18 +0100
+Subject: [PATCH 1/1] [ffmpeg] fixed missing S_DVBSUB subtitles
+
+---
+ lib/ffmpeg/libavformat/matroska.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/ffmpeg/libavformat/matroska.c b/lib/ffmpeg/libavformat/matroska.c
+index 2f5b617..11c2fa5 100644
+--- a/lib/ffmpeg/libavformat/matroska.c
++++ b/lib/ffmpeg/libavformat/matroska.c
+@@ -59,6 +59,7 @@ const CodecTags ff_mkv_codec_tags[]={
+ {"S_ASS" , CODEC_ID_SSA},
+ {"S_SSA" , CODEC_ID_SSA},
+ {"S_VOBSUB" , CODEC_ID_DVD_SUBTITLE},
++ {"S_DVBSUB" , CODEC_ID_DVB_SUBTITLE},
+ {"S_HDMV/PGS" , CODEC_ID_HDMV_PGS_SUBTITLE},
+
+ {"V_DIRAC" , CODEC_ID_DIRAC},
+--
+1.8.0
+