summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-03 06:53:10 +0200
committerwm4 <wm4@nowhere>2012-08-03 06:53:10 +0200
commita78bb28ed63908ce2e02916dfefc0b0eb0af5807 (patch)
tree380896ad9acc6897616f68b320de8c505920f98f /sub
parentadde96a814b7fcca6f468c89a08fe92ff5f87a4f (diff)
downloadmpv-a78bb28ed63908ce2e02916dfefc0b0eb0af5807.tar.bz2
mpv-a78bb28ed63908ce2e02916dfefc0b0eb0af5807.tar.xz
sub: simplify code by always defining sub_cp
Diffstat (limited to 'sub')
-rw-r--r--sub/ass_mp.c4
-rw-r--r--sub/subreader.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c
index bffc42d7cf..8266f45d2e 100644
--- a/sub/ass_mp.c
+++ b/sub/ass_mp.c
@@ -38,10 +38,6 @@
#include "stream/stream.h"
#include "options.h"
-#ifndef CONFIG_ICONV
-static char *sub_cp = 0;
-#endif
-
ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts)
{
ASS_Track *track = ass_new_track(library);
diff --git a/sub/subreader.c b/sub/subreader.c
index dc40b57c62..2ecc41c346 100644
--- a/sub/subreader.c
+++ b/sub/subreader.c
@@ -45,9 +45,11 @@
#ifdef CONFIG_ICONV
#include <iconv.h>
-char *sub_cp=NULL;
#endif
+char *sub_cp=NULL;
+
+
int suboverlap_enabled = 1;
// Parameter struct for the format-specific readline functions