CVS: main/libmpdemux demux_mkv.c, 1.14, 1.15 demux_ogg.c, 1.51, 1.52
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;
On Sat, May 08, 2004 at 07:52:27PM +0200, Jindrich Makovicka CVS wrote:
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
Hmm ? This looks very bogous. I can currently not chekc what ENCA is (writting this mail offline) but it's definitly not iconv. Please either state why ENCA is iconv or reverse this change. Attila Kinali
attila said:
On Sat, May 08, 2004 at 07:52:27PM +0200, Jindrich Makovicka CVS wrote:
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
Hmm ? This looks very bogous. I can currently not chekc what ENCA is (writting this mail offline) but it's definitly not iconv. Please either state why ENCA is iconv or reverse this change.
Attila Kinali Enca is a library that is trying to guess the codepage by knowing the country and having a sample from the text. subcp_open_noenca() simply parse the subcp command line parameter and pass it to subcp_open(char *), that now takes an codepage as parameter. Yeh i agree that it looks like cosmetic change, but I guess it is too late already:(
Wish You Best Ivan Kalvachev iive
Hi,
subcp_open_noenca() simply parse the subcp command line parameter...
Text subs in Matroska are always (!) stored in UTF-8. No need for guessing. Mosu -- If Darl McBride was in charge, he'd probably make marriage unconstitutional too, since clearly it de-emphasizes the commercial nature of normal human interaction, and probably is a major impediment to the commercial growth of prostitution. - Linus Torvalds
On Wed, Jul 21, 2004 at 11:37:30PM +0300, Ivan Kalvachev wrote:
attila said:
#ifdef USE_ICONV - subcp_open(); + subcp_open_noenca(); #endif
Hmm ? This looks very bogous. I can currently not chekc what ENCA is (writting this mail offline) but it's definitly not iconv. Please either state why ENCA is iconv or reverse this change.
Attila Kinali Enca is a library that is trying to guess the codepage by knowing the country and having a sample from the text. subcp_open_noenca() simply parse the subcp command line parameter and pass it to subcp_open(char *), that now takes an codepage as parameter. Yeh i agree that it looks like cosmetic change, but I guess it is too late already:(
That wasnt what i meant. The patch changes the call of the init function from iconv to enca without changing the #ifdef. ie i suspect that it breaks iconv if enca isnt installed. IMHO it should be rather something like #ifdev USE_ICONV #ifdev HAVE_ENCA subcp_open_noenca(); #elseif subcp_open(); #endif #endif or am i mistaken ? Attila Kinali
Hi,
That wasnt what i meant. The patch changes the call of the init function from iconv to enca without changing the #ifdef. ie i suspect that it breaks iconv if enca isnt installed.
IMHO it should be rather something like
#ifdev USE_ICONV #ifdev HAVE_ENCA subcp_open_noenca(); #elseif subcp_open(); #endif #endif
or am i mistaken ?
subcp_open_noenca() was defined differently depending HAVE_ENCA. But I changed things anyway, now it is subcp_open(NULL) Greetings, Reimar Döffinger
participants (6)
-
attila -
Attila Kinali -
Ivan Kalvachev -
Moritz Bunkus -
Reimar Döffinger -
syncmail＠mplayerhq.hu