From a78bb28ed63908ce2e02916dfefc0b0eb0af5807 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 3 Aug 2012 06:53:10 +0200
Subject: sub: simplify code by always defining sub_cp

---
 sub/ass_mp.c    | 4 ----
 sub/subreader.c | 4 +++-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'sub')

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
-- 
cgit v1.2.3