Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
dvb charset: a quick-fix for the latest merge
  • Loading branch information
perexg committed Aug 4, 2014
1 parent 10446d4 commit 7e442f4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/input/mpegts/dvb_support.c
Expand Up @@ -43,10 +43,10 @@ static int convert_iso_8859[16] = {
static inline int code_convert(const char *from_charset,const char *to_charset,char *inbuf,size_t inlen,char *outbuf,size_t *outlen)
{
iconv_t cd;

char **pin = &inbuf;
char **pout = &outbuf;

cd = iconv_open(to_charset,from_charset);
if (cd==0) return -1;
memset(outbuf,0,*outlen);
Expand Down Expand Up @@ -302,12 +302,12 @@ dvb_get_string
ic = convert_ucs2;
src++; srclen--;
break;

case 0x13:
ic = convert_gb;
src++; srclen--;
break;

case 0x12:
case 0x14:
return -1;
Expand Down Expand Up @@ -337,9 +337,9 @@ dvb_get_string
} else if (!strcmp(dvb_charset, "UTF-8")) {
ic = convert_utf8;
} else if (!strcmp(dvb_charset, "GB2312")) {
ic= convert_gb;
ic = convert_gb;
} else if (!strcmp(dvb_charset, "UCS2")) {
ic= conv_UCS2;
ic = convert_ucs2;
}
}

Expand Down

0 comments on commit 7e442f4

Please sign in to comment.