summaryrefslogtreecommitdiffstats
path: root/subreader.c
diff options
context:
space:
mode:
authoriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-28 15:53:08 +0000
committeriive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-10-28 15:53:08 +0000
commitb69670151ccfc3f370ae1a5ca400b3c691dcdbf3 (patch)
treeed8123d791c43fa9d23df6d1a1fdec4631dd3324 /subreader.c
parentb43c16f8b68657d93ff920d5ec5a4a52a01f426a (diff)
downloadmpv-b69670151ccfc3f370ae1a5ca400b3c691dcdbf3.tar.bz2
mpv-b69670151ccfc3f370ae1a5ca400b3c691dcdbf3.tar.xz
Cleanup guess_buffer_cp() a bit, remove tmp variable, break the loop on success.
Requested by ulion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24880 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'subreader.c')
-rw-r--r--subreader.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/subreader.c b/subreader.c
index 62b01e964e..3fb29f29b2 100644
--- a/subreader.c
+++ b/subreader.c
@@ -1287,17 +1287,14 @@ const char* guess_buffer_cp(unsigned char* buffer, int buflen, char *preferred_
mp_msg(MSGT_SUBREADER, MSGL_V, "\n");
for (i = 0; i < langcnt; i++) {
- const char *tmp;
-
if (strcasecmp(languages[i], preferred_language) != 0) continue;
analyser = enca_analyser_alloc(languages[i]);
encoding = enca_analyse_const(analyser, buffer, buflen);
- tmp = enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV);
- if (tmp && encoding.charset != ENCA_CS_UNKNOWN) {
- detected_sub_cp = tmp;
- mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detected charset: %s\n", tmp);
- }
enca_analyser_free(analyser);
+ if (encoding.charset != ENCA_CS_UNKNOWN) {
+ detected_sub_cp = enca_charset_name(encoding.charset, ENCA_NAME_STYLE_ICONV);
+ break;
+ }
}
free(languages);
@@ -1305,6 +1302,8 @@ const char* guess_buffer_cp(unsigned char* buffer, int buflen, char *preferred_
if (!detected_sub_cp) {
detected_sub_cp = fallback;
mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detection failed: fallback to %s\n", fallback);
+ }else{
+ mp_msg(MSGT_SUBREADER, MSGL_INFO, "ENCA detected charset: %s\n", detected_sub_cp);
}
return detected_sub_cp;