Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
dvb support: more fixes in conv_utf8() - fixes#2414
- add ucs2 for 0x14
- fix the first character skip for 0x15 (utf8)
  • Loading branch information
perexg committed Oct 23, 2014
1 parent 82b17a7 commit 1d2df40
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/input/mpegts/dvb_support.c
Expand Up @@ -99,7 +99,7 @@ static inline size_t conv_UCS2(const uint8_t *src, size_t srclen,char *dst, size
}

static inline size_t conv_utf8(const uint8_t *src, size_t srclen,
char *dst, size_t *dstlen)
char *dst, size_t *dstlen)
{
while (srclen>0 && (*dstlen)>0) {
*dst = (char) *src;
Expand Down Expand Up @@ -270,6 +270,7 @@ dvb_get_string
break;

case 0x0c ... 0x0f:
src++; srclen--;
break;

case 0x10: /* Table A.4 */
Expand All @@ -291,13 +292,21 @@ dvb_get_string
break;

case 0x12:
src++; srclen--;
break;

case 0x14:
ic = convert_ucs2;
src++; srclen--;
break;

case 0x15:
ic = convert_utf8;
src++; srclen--;
break;

case 0x16 ... 0x1f:
src++; srclen--;
break;

default:
Expand Down

0 comments on commit 1d2df40

Please sign in to comment.