summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorphintuka <phintuka>2007-06-26 15:14:11 +0000
committerphintuka <phintuka>2007-06-26 15:14:11 +0000
commitb261a92d4af2a02f3b739020d5dbeb6d066436f0 (patch)
treef6726e67b28b512b79a88564f6f286b39b03f088
parent0714184529e716be347effdb6e307ec212ac53af (diff)
downloadxineliboutput-b261a92d4af2a02f3b739020d5dbeb6d066436f0.tar.gz
xineliboutput-b261a92d4af2a02f3b739020d5dbeb6d066436f0.tar.bz2
Fix compilation with VDR >= 1.5.3 (Patch from Thomas Günther)
-rw-r--r--tools/iconv.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/iconv.h b/tools/iconv.h
index 0402c70b..f83a58a9 100644
--- a/tools/iconv.h
+++ b/tools/iconv.h
@@ -4,7 +4,7 @@
* See the main source file 'xineliboutput.c' for copyright information and
* how to reach the author.
*
- * $Id: iconv.h,v 1.3 2007-06-11 19:41:07 phintuka Exp $
+ * $Id: iconv.h,v 1.4 2007-06-26 15:14:11 phintuka Exp $
*
*/
@@ -40,7 +40,11 @@ cIConv::cIConv(const char *SrcCharset, const char * DstCharset)
if(!SrcCharset)
SrcCharset = "UTF-8";
if(!DstCharset)
+#if APIVERSNUM >= 10503
+ DstCharset = cCharSetConv::SystemCharacterTable();
+#else
DstCharset = I18nCharSets()[Setup.OSDLanguage];
+#endif
m_ic = iconv_open(DstCharset, SrcCharset);