summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-22 23:40:48 +0200
committerwm4 <wm4@nowhere>2014-07-22 23:40:48 +0200
commitaa1a383342f72fb0dfb1fb016535735bc0480e7e (patch)
tree80a513403a6cb4a1adf4fb39be04ef630ff9fb1b /options
parent63373ca424f5eaef50a797b7bc7f6c395ed23331 (diff)
downloadmpv-aa1a383342f72fb0dfb1fb016535735bc0480e7e.tar.bz2
mpv-aa1a383342f72fb0dfb1fb016535735bc0480e7e.tar.xz
sub: add detection via BOM
Useful for Windows stuff. Actually, ENCA support should catch this, but, well, whatever, everyone seems to hate ENCA. Detection with BOM is trivial, although it needs some hackery to integrate it with the existing autodetection support. For one, change the default value of --sub-codepage to make this easier. Probably fixes issue #937 (the second part).
Diffstat (limited to 'options')
-rw-r--r--options/options.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/options/options.c b/options/options.c
index fd37d63197..1e3c98c087 100644
--- a/options/options.c
+++ b/options/options.c
@@ -636,11 +636,7 @@ const struct MPOpts mp_default_opts = {
.ass_shaper = 1,
.use_embedded_fonts = 1,
.sub_fix_timing = 1,
-#if HAVE_ENCA
- .sub_cp = "enca",
-#else
- .sub_cp = "UTF-8:UTF-8-BROKEN",
-#endif
+ .sub_cp = "auto",
.hwdec_codecs = "h264,vc1,wmv3",