[Mplayer-cvslog] CVS: main/libmpdemux demux_ogg.c,1.21,1.22

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv32067/libmpdemux

Modified Files:
	demux_ogg.c 
Log Message:
This patch adds a call to subcp_recode1(), so this subtitles too are
processed through iconv().
Kresimir Kukulj                      madmax at iskon.hr


Index: demux_ogg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- demux_ogg.c	5 Dec 2002 21:04:26 -0000	1.21
+++ demux_ogg.c	28 Dec 2002 15:19:41 -0000	1.22
@@ -231,6 +231,9 @@
 
   mp_msg(MSGT_DEMUX,MSGL_DBG2,"ogg sub lines: %d  first: '%s'\n",
       ogg_sub.lines, ogg_sub.text[0]);
+#ifdef USE_ICONV
+  subcp_recode1(&ogg_sub);
+#endif
   vo_sub = &ogg_sub;
   vo_osd_changed(OSDTYPE_SUBTITLE);
 }
@@ -465,6 +468,10 @@
   sh_audio_t* sh_a;
   sh_video_t* sh_v;
 
+#ifdef USE_ICONV
+  subcp_open();
+#endif
+
   s = demuxer->stream;
 
   ogg_d = (ogg_demuxer_t*)calloc(1,sizeof(ogg_demuxer_t));
@@ -1005,6 +1012,10 @@
 
   if(!ogg_d)
     return;
+
+#ifdef USE_ICONV
+  subcp_close();
+#endif
 
   if(ogg_d->subs)
     free(ogg_d->subs);