github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-10-18 10:25:02 +02:00
Code Releases Activity

maybe fix ogm vs. iconv

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9144 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-01-28 18:28:09 +00:00
parent dc2eda37b3
commit 7e5bca4243
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subreader.c
View File

@ -934,6 +934,7 @@ void subcp_close (void)
{ {
if (icdsc != (iconv_t)(-1)){ if (icdsc != (iconv_t)(-1)){
(void) iconv_close (icdsc); (void) iconv_close (icdsc);
icdsc = (iconv_t)(-1);
sub_utf8=sub_utf8_prev; sub_utf8=sub_utf8_prev;
mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: closed iconv descriptor.\n"); mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: closed iconv descriptor.\n");
} }
@ -983,18 +984,19 @@ subtitle* subcp_recode1 (subtitle *sub)
{ {
int l=sub->lines; int l=sub->lines;
size_t ileft, oleft; size_t ileft, oleft;
char *op, *ip;
if(icdsc == (iconv_t)(-1)) return sub;
while (l){ while (l){
ip = icbuffer; char *ip = icbuffer;
op = sub->text[--l]; char *op = sub->text[--l];
strcpy(ip, op); strcpy(ip, op);
ileft = strlen(ip); ileft = strlen(ip);
oleft = ICBUFFSIZE - 1; oleft = ICBUFFSIZE - 1;
if (iconv(icdsc, &ip, &ileft, if (iconv(icdsc, &ip, &ileft,
&op, &oleft) == (size_t)(-1)) { &op, &oleft) == (size_t)(-1)) {
mp_msg(MSGT_SUBREADER,MSGL_WARN,"SUB: error recoding line (2).\n"); mp_msg(MSGT_SUBREADER,MSGL_V,"SUB: error recoding line (2).\n");
return sub; return sub;
} }
*op='\0' ; *op='\0' ;