diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2006-03-01 23:34:58 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2006-03-01 23:34:58 +0000 |
| commit | 15d5d271921e9c4005759ab93455339999b899aa (patch) | |
| tree | 293b62838ec79591d94a2ca0bbbca2025c372817 | |
| parent | 5a5b0d9a50a748dbd0f4fcf3f6ee30b44ab4daff (diff) | |
| download | xine-lib-15d5d271921e9c4005759ab93455339999b899aa.tar.gz xine-lib-15d5d271921e9c4005759ab93455339999b899aa.tar.bz2 | |
- no need to convert to UTF-8 if the "from" encoding is already UTF-8
CVS patchset: 7913
CVS date: 2006/03/01 23:34:58
| -rw-r--r-- | src/xine-engine/info_helper.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c index f33f6197a..7f356426b 100644 --- a/src/xine-engine/info_helper.c +++ b/src/xine-engine/info_helper.c @@ -20,7 +20,7 @@ * stream metainfo helper functions * hide some xine engine details from demuxers and reduce code duplication * - * $Id: info_helper.c,v 1.14 2004/12/20 21:22:21 mroi Exp $ + * $Id: info_helper.c,v 1.15 2006/03/01 23:34:58 hadess Exp $ */ #ifdef HAVE_CONFIG_H @@ -205,7 +205,7 @@ static void meta_info_set_unlocked_encoding(xine_stream_t *stream, int info, con } } - if (enc) { + if (enc && strcmp(enc, "UTF-8")) { cd = iconv_open("UTF-8", enc); if (cd == (iconv_t)-1) xprintf(stream->xine, XINE_VERBOSITY_LOG, |