summaryrefslogtreecommitdiffstats
path: root/mplayer.c
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 /mplayer.c
parentadde96a814b7fcca6f468c89a08fe92ff5f87a4f (diff)
downloadmpv-a78bb28ed63908ce2e02916dfefc0b0eb0af5807.tar.bz2
mpv-a78bb28ed63908ce2e02916dfefc0b0eb0af5807.tar.xz
sub: simplify code by always defining sub_cp
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c4
1 files changed, 0 insertions, 4 deletions
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);