From 027ed1e38e0b930ad1af6de0cb76430bd89a1e4d Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 16 Jan 2005 12:17:41 +0000 Subject: set sub_utf8 only when actually using mkv subtitles, will break external subtitles (-sub) otherwise. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14514 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mkv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libmpdemux/demux_mkv.c') diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index d68e1408b0..ea34ed8573 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -1041,14 +1041,12 @@ demux_mkv_read_trackentry (demuxer_t *demuxer) || !strcmp (track->codec_id, MKV_S_ASS)) { track->subtitle_type = MATROSKA_SUBTYPE_SSA; - sub_utf8 = 1; } else if (!strcmp (track->codec_id, MKV_S_TEXTASCII)) track->subtitle_type = MATROSKA_SUBTYPE_TEXT; if (!strcmp (track->codec_id, MKV_S_TEXTUTF8)) { track->subtitle_type = MATROSKA_SUBTYPE_TEXT; - sub_utf8 = 1; } mp_msg (MSGT_DEMUX, MSGL_V, "[mkv] | + Codec ID: %s\n", track->codec_id); @@ -2642,6 +2640,7 @@ handle_subtitles(demuxer_t *demuxer, mkv_track_t *track, char *block, #ifdef USE_ICONV subcp_recode1 (&mkv_d->subs); #endif + sub_utf8 = 1; vo_sub = &mkv_d->subs; vo_osd_changed (OSDTYPE_SUBTITLE); } -- cgit v1.2.3