From: Yen Chi Hsuan Date: Sat, 19 Nov 2016 16:05:11 +0000 (+0800) Subject: Merge branch 'master' of https://github.com/DarkstaIkers/youtube-dl into DarkstaIkers... X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=commitdiff_plain;h=fb27d0ce5e91216296e3406d461fe5b7af78c477;hp=0aacd2deb1075e0d4d4b8b23b9a65b3967a1d658;p=youtube-dl.git Merge branch 'master' of https://github.com/DarkstaIkers/youtube-dl into DarkstaIkers-master --- diff --git a/youtube_dl/extractor/crunchyroll.py b/youtube_dl/extractor/crunchyroll.py index cc141f68e..8d5b69f68 100644 --- a/youtube_dl/extractor/crunchyroll.py +++ b/youtube_dl/extractor/crunchyroll.py @@ -236,7 +236,7 @@ class CrunchyrollIE(CrunchyrollBaseIE): output += 'WrapStyle: %s\n' % sub_root.attrib['wrap_style'] output += 'PlayResX: %s\n' % sub_root.attrib['play_res_x'] output += 'PlayResY: %s\n' % sub_root.attrib['play_res_y'] - output += """ScaledBorderAndShadow: yes + output += """ScaledBorderAndShadow: no [V4+ Styles] Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding