#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_demux.h>
+#include <vlc_charset.h>
#include <ctype.h>
#define MAX_LINE 16024
unsigned int length;
unsigned char encoding_type;
- vlc_iconv_t conv;
- size_t buf16_size;
unsigned char *buf16;
- const char *p_buf16;
- size_t buf8_size;
char *buf8;
- char *p_buf8;
char *p_input = p_encoded;
return NULL;
}
- buf16_size = length;
- buf16 = malloc( buf16_size );
+ buf16 = malloc( length );
if( buf16 == NULL )
return NULL;
}
}
- buf8_size = length;
- buf8 = malloc( buf8_size + 1 );
+ buf8 = FromCharset( "UTF-16LE", buf16, length );
+ free( buf16 );
if( buf8 == NULL )
- {
- free( buf16 );
- return NULL;
- }
-
- conv = vlc_iconv_open( "UTF-8", "UTF-16LE" );
- if( conv == (vlc_iconv_t)(-1) )
- {
- msg_Err( p_demux, "iconv_open failed" );
- free( buf16 );
- free( buf8 );
- return NULL;
- }
-
- p_buf8 = buf8;
- p_buf16 = (const char *)buf16;
-
- if( vlc_iconv( conv, &p_buf16, &buf16_size, &p_buf8, &buf8_size ) == (size_t)(-1) )
{
msg_Err( p_demux, "iconv failed" );
return NULL;
}
- else
- {
- buf8[ length - buf8_size ] = '\0';
- }
-
- vlc_iconv_close( conv );
-
- free( buf16 );
return buf8;
}