From 29acc57b415881cfce93ae07981cc66a43a27388 Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 25 Jun 2008 17:48:43 +0100 Subject: Restore iconv_open() (mismerge). --- src/demuxers/asfheader.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src') 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); -- cgit v1.2.3