[MPlayer-cvslog] CVS: main/libmpdemux demux_mkv.c,1.34,1.35

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv27877

Modified Files:
	demux_mkv.c 
Log Message:
set sub_utf8 only when actually using mkv subtitles, will break external
subtitles (-sub) otherwise.


Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- demux_mkv.c	15 Jan 2005 16:11:44 -0000	1.34
+++ demux_mkv.c	16 Jan 2005 12:17:41 -0000	1.35
@@ -1041,14 +1041,12 @@
                    || !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 @@
 #ifdef USE_ICONV
   subcp_recode1 (&mkv_d->subs);
 #endif
+  sub_utf8 = 1;
   vo_sub = &mkv_d->subs;
   vo_osd_changed (OSDTYPE_SUBTITLE);
 }