diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-25 17:48:43 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-25 17:48:43 +0100 |
| commit | 29acc57b415881cfce93ae07981cc66a43a27388 (patch) | |
| tree | 62bf18a85c227c11df2dd01a9f3a5e66b4650b1b /src | |
| parent | 683816956c72b12685e60e3082e2195d8eaa7758 (diff) | |
| download | xine-lib-29acc57b415881cfce93ae07981cc66a43a27388.tar.gz xine-lib-29acc57b415881cfce93ae07981cc66a43a27388.tar.bz2 | |
Restore iconv_open() (mismerge).
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/asfheader.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c index 776d6cc03..4992e2889 100644 --- a/src/demuxers/asfheader.c +++ b/src/demuxers/asfheader.c @@ -581,6 +581,9 @@ static int asf_header_parse_content_description(asf_header_t *header_pub, uint8_ if (!content)
return 0;
+ if ( (iconv_cd = iconv_open("UTF-8", "UCS-2LE")) == (iconv_t)-1 )
+ return 0;
+
asf_reader_init(&reader, buffer, buffer_len);
asf_reader_get_16(&reader, &title_length);
asf_reader_get_16(&reader, &author_length);
|