OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c6779c5
)
matroska: fixed missing S_DVBSUB subtitles
author
Allan Kristensen
<allank@tigerdyr.com>
Fri, 21 Dec 2012 20:04:18 +0000
(21:04 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 1 Feb 2013 00:49:04 +0000
(
01:49
+0100)
libavformat/matroska.c
patch
|
blob
|
history
diff --git
a/libavformat/matroska.c
b/libavformat/matroska.c
index
394a62f
..
519f881
100644
(file)
--- a/
libavformat/matroska.c
+++ b/
libavformat/matroska.c
@@
-66,6
+66,7
@@
const CodecTags ff_mkv_codec_tags[]={
{"S_ASS" , AV_CODEC_ID_SSA},
{"S_SSA" , AV_CODEC_ID_SSA},
{"S_VOBSUB" , AV_CODEC_ID_DVD_SUBTITLE},
+ {"S_DVBSUB" , AV_CODEC_ID_DVB_SUBTITLE},
{"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE},
{"V_DIRAC" , AV_CODEC_ID_DIRAC},