[Mplayer-cvslog] CVS: main/libmpdemux demux_ogg.c, 1.53, 1.54 demux_mkv.c, 1.18, 1.19 demux_mkv_old.cpp, 1.55, 1.56

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

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

Modified Files:
	demux_ogg.c demux_mkv.c demux_mkv_old.cpp 
Log Message:
fixes a crash and unchecked string-handling in ENCA code.
Also does a bit of cleanup.


Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- demux_ogg.c	27 Jun 2004 13:55:40 -0000	1.53
+++ demux_ogg.c	28 Jul 2004 12:40:35 -0000	1.54
@@ -669,7 +669,7 @@
   sh_video_t* sh_v;
 
 #ifdef USE_ICONV
-  subcp_open_noenca();
+  subcp_open(NULL);
 #endif
 
   clear_sub = -1;

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- demux_mkv.c	28 Jun 2004 16:43:01 -0000	1.18
+++ demux_mkv.c	28 Jul 2004 12:40:35 -0000	1.19
@@ -2018,7 +2018,7 @@
   char *str;
 
 #ifdef USE_ICONV
-  subcp_open_noenca();
+  subcp_open(NULL);
 #endif
 
   stream_seek(s, s->start_pos);

Index: demux_mkv_old.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv_old.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- demux_mkv_old.cpp	14 Jul 2004 14:35:45 -0000	1.55
+++ demux_mkv_old.cpp	28 Jul 2004 12:40:35 -0000	1.56
@@ -1552,7 +1552,7 @@
   qt_image_description_t *idesc;
 
 #ifdef USE_ICONV
-  subcp_open_noenca();
+  subcp_open(NULL);
 #endif
 
   s = demuxer->stream;