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

---
 mplayer.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'mplayer.c')

diff --git a/mplayer.c b/mplayer.c
index 3b53e9301e..455926b31c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -908,11 +908,7 @@ void add_subtitles(struct MPContext *mpctx, char *filename, float fps,
 
 #ifdef CONFIG_ASS
     if (opts->ass_enabled) {
-#ifdef CONFIG_ICONV
         asst = mp_ass_read_stream(mpctx->ass_library, filename, sub_cp);
-#else
-        asst = mp_ass_read_stream(mpctx->ass_library, filename, 0);
-#endif
         is_native_ass = asst;
         if (!asst) {
             subd = sub_read_file(filename, fps, &mpctx->opts);
-- 
cgit v1.2.3