projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b966740
)
[adn] fix subtitle compatibility with ffmpeg
author
Remita Amine
<remitamine@gmail.com>
Thu, 4 Apr 2019 16:59:20 +0000
(17:59 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Thu, 4 Apr 2019 16:59:20 +0000
(17:59 +0100)
youtube_dl/extractor/adn.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/adn.py
b/youtube_dl/extractor/adn.py
index 2eb4d1dc7e197ff044af335200d7ca4220701d51..1e04a55a6a47793504e368669a21d967b5a8980c 100644
(file)
--- a/
youtube_dl/extractor/adn.py
+++ b/
youtube_dl/extractor/adn.py
@@
-81,10
+81,10
@@
class ADNIE(InfoExtractor):
ssa = '''[Script Info]
ScriptType:V4.00
[V4 Styles]
ssa = '''[Script Info]
ScriptType:V4.00
[V4 Styles]
-Format:
Name,Fontname,Fontsize,PrimaryColour,Bold,BorderStyle,Outline,Alignment,MarginL,MarginR,MarginV
-Style:
Default,Arial,18,16777215,-1,1,1,2,20,20,2
0
+Format:
Name,Fontname,Fontsize,PrimaryColour,SecondaryColour,TertiaryColour,BackColour,Bold,Italic,BorderStyle,Outline,Shadow,Alignment,MarginL,MarginR,MarginV,AlphaLevel,Encoding
+Style:
Default,Arial,18,16777215,16777215,16777215,0,-1,0,1,1,0,2,20,20,20,0,
0
[Events]
[Events]
-Format:
Marked,Start,End,Style
,Text'''
+Format:
Marked,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect
,Text'''
for current in sub:
start, end, text, line_align, position_align = (
float_or_none(current.get('startTime')),
for current in sub:
start, end, text, line_align, position_align = (
float_or_none(current.get('startTime')),
@@
-94,7
+94,7
@@
Format:Marked,Start,End,Style,Text'''
if start is None or end is None or text is None:
continue
alignment = self._POS_ALIGN_MAP.get(position_align, 2) + self._LINE_ALIGN_MAP.get(line_align, 0)
if start is None or end is None or text is None:
continue
alignment = self._POS_ALIGN_MAP.get(position_align, 2) + self._LINE_ALIGN_MAP.get(line_align, 0)
- ssa += os.linesep + 'Dialogue:
Marked=0,%s,%s,Default
,%s%s' % (
+ ssa += os.linesep + 'Dialogue:
Marked=0,%s,%s,Default,,0,0,0,
,%s%s' % (
self._ass_subtitles_timecode(start),
self._ass_subtitles_timecode(end),
'{\\a%d}' % alignment if alignment != 2 else '',
self._ass_subtitles_timecode(start),
self._ass_subtitles_timecode(end),
'{\\a%d}' % alignment if alignment != 2 else '',