Mercurial > mplayer.hg
comparison subreader.c @ 12449:44959468c64d
1000000l for sig11 without -subcp!!! (and 1l for my first commit :)
author | rfelker |
---|---|
date | Sun, 09 May 2004 03:43:42 +0000 |
parents | ae4ae7ab636c |
children | 092875b4fea7 |
comparison
equal
deleted
inserted
replaced
12448:180c2fb327d3 | 12449:44959468c64d |
---|---|
1351 #ifdef HAVE_ENCA | 1351 #ifdef HAVE_ENCA |
1352 if (sscanf(sub_cp, "enca:%2s:%s", enca_lang, enca_fallback) == 2 | 1352 if (sscanf(sub_cp, "enca:%2s:%s", enca_lang, enca_fallback) == 2 |
1353 || sscanf(sub_cp, "ENCA:%2s:%s", enca_lang, enca_fallback) == 2) { | 1353 || sscanf(sub_cp, "ENCA:%2s:%s", enca_lang, enca_fallback) == 2) { |
1354 current_sub_cp = guess_cp(fd, enca_lang, enca_fallback); | 1354 current_sub_cp = guess_cp(fd, enca_lang, enca_fallback); |
1355 } else { | 1355 } else { |
1356 current_sub_cp = strdup(sub_cp); | 1356 current_sub_cp = sub_cp ? strdup(sub_cp) : NULL; |
1357 } | 1357 } |
1358 #else | 1358 #else |
1359 current_sub_cp = strdup(sub_cp); | 1359 current_sub_cp = sub_cp ? strdup(sub_cp) : NULL; |
1360 #endif | 1360 #endif |
1361 | 1361 |
1362 #ifdef USE_ICONV | 1362 #ifdef USE_ICONV |
1363 sub_utf8_prev=sub_utf8; | 1363 sub_utf8_prev=sub_utf8; |
1364 { | 1364 { |