summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-16 12:17:41 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-16 12:17:41 +0000
commit027ed1e38e0b930ad1af6de0cb76430bd89a1e4d (patch)
treed5094950aad0a75f230048eab7feca0c0afb357f /libmpdemux/demux_mkv.c
parent4b22c51195f314db05bf2415ddf73ae88899b84b (diff)
downloadmpv-027ed1e38e0b930ad1af6de0cb76430bd89a1e4d.tar.bz2
mpv-027ed1e38e0b930ad1af6de0cb76430bd89a1e4d.tar.xz
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
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c3
1 files changed, 1 insertions, 2 deletions
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);
}