summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authoreugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-02 19:55:45 +0000
committereugeni <eugeni@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-09-02 19:55:45 +0000
commite12a9c7206e49fd0b6e867c33b8941121525127e (patch)
tree288198033867eb755732d026c3ec611cb838383a /libmpdemux/demux_mkv.c
parent1ad2da1fbbda1581b2162f2e54289f5ed52716f1 (diff)
downloadmpv-e12a9c7206e49fd0b6e867c33b8941121525127e.tar.bz2
mpv-e12a9c7206e49fd0b6e867c33b8941121525127e.tar.xz
Matroska subtitles are always utf-8, no need to recode them.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19648 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 7f60cabc04..6819226720 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -2941,9 +2941,6 @@ handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block,
}
mkv_d->clear_subs_at[mkv_d->subs.lines++] = timecode + block_duration;
-#ifdef USE_ICONV
- subcp_recode1 (&mkv_d->subs);
-#endif
sub_utf8 = 1;
vo_sub = &mkv_d->subs;
vo_osd_changed (OSDTYPE_SUBTITLE);