[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.c, 1.14, 1.15 demux_ogg.c, 1.51, 1.52

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

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

Modified Files:
	demux_mkv.c demux_ogg.c 
Log Message:
ENCA support (http://trific.ath.cx/software/enca/)

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- demux_mkv.c	26 Apr 2004 09:22:17 -0000	1.14
+++ demux_mkv.c	8 May 2004 17:52:25 -0000	1.15
@@ -1832,7 +1832,7 @@
   char *str;
 
 #ifdef USE_ICONV
-  subcp_open();
+  subcp_open_noenca();
 #endif
 
   stream_seek(s, s->start_pos);

Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- demux_ogg.c	7 May 2004 08:31:39 -0000	1.51
+++ demux_ogg.c	8 May 2004 17:52:25 -0000	1.52
@@ -664,7 +664,7 @@
   sh_video_t* sh_v;
 
 #ifdef USE_ICONV
-  subcp_open();
+  subcp_open_noenca();
 #endif
 
   clear_sub = -1;