Mercurial > mplayer.hg
comparison libass/ass.c @ 27359:d788e177a35e
Rename some preprocessor directives from CONFIG_* to HAVE_* where appropriate;
CONFIG_ prefix for configurable options, HAVE_ for system-dependent stuff.
author | diego |
---|---|
date | Fri, 01 Aug 2008 20:28:58 +0000 |
parents | e7c989f7a7c9 |
children | 4876c89bafdd |
comparison
equal
deleted
inserted
replaced
27358:e736897cf006 | 27359:d788e177a35e |
---|---|
30 #include <sys/types.h> | 30 #include <sys/types.h> |
31 #include <sys/stat.h> | 31 #include <sys/stat.h> |
32 #include <unistd.h> | 32 #include <unistd.h> |
33 #include <inttypes.h> | 33 #include <inttypes.h> |
34 | 34 |
35 #ifdef CONFIG_ICONV | 35 #ifdef HAVE_ICONV |
36 #include <iconv.h> | 36 #include <iconv.h> |
37 #endif | 37 #endif |
38 | 38 |
39 #include "ass.h" | 39 #include "ass.h" |
40 #include "ass_utils.h" | 40 #include "ass_utils.h" |
808 ass_free_event(track, eid); | 808 ass_free_event(track, eid); |
809 track->n_events--; | 809 track->n_events--; |
810 free(str); | 810 free(str); |
811 } | 811 } |
812 | 812 |
813 #ifdef CONFIG_ICONV | 813 #ifdef HAVE_ICONV |
814 /** \brief recode buffer to utf-8 | 814 /** \brief recode buffer to utf-8 |
815 * constraint: codepage != 0 | 815 * constraint: codepage != 0 |
816 * \param data pointer to text buffer | 816 * \param data pointer to text buffer |
817 * \param size buffer size | 817 * \param size buffer size |
818 * \return a pointer to recoded buffer, caller is responsible for freeing it | 818 * \return a pointer to recoded buffer, caller is responsible for freeing it |
989 int need_free = 0; | 989 int need_free = 0; |
990 | 990 |
991 if (!buf) | 991 if (!buf) |
992 return 0; | 992 return 0; |
993 | 993 |
994 #ifdef CONFIG_ICONV | 994 #ifdef HAVE_ICONV |
995 if (codepage) | 995 if (codepage) |
996 buf = sub_recode(buf, bufsize, codepage); | 996 buf = sub_recode(buf, bufsize, codepage); |
997 if (!buf) | 997 if (!buf) |
998 return 0; | 998 return 0; |
999 else | 999 else |
1015 size_t bufsize; | 1015 size_t bufsize; |
1016 | 1016 |
1017 buf = read_file(fname, &bufsize); | 1017 buf = read_file(fname, &bufsize); |
1018 if (!buf) | 1018 if (!buf) |
1019 return 0; | 1019 return 0; |
1020 #ifdef CONFIG_ICONV | 1020 #ifdef HAVE_ICONV |
1021 if (codepage) { | 1021 if (codepage) { |
1022 char* tmpbuf = sub_recode(buf, bufsize, codepage); | 1022 char* tmpbuf = sub_recode(buf, bufsize, codepage); |
1023 free(buf); | 1023 free(buf); |
1024 buf = tmpbuf; | 1024 buf = tmpbuf; |
1025 } | 1025 } |
1069 size_t sz; | 1069 size_t sz; |
1070 | 1070 |
1071 buf = read_file(fname, &sz); | 1071 buf = read_file(fname, &sz); |
1072 if (!buf) | 1072 if (!buf) |
1073 return 1; | 1073 return 1; |
1074 #ifdef CONFIG_ICONV | 1074 #ifdef HAVE_ICONV |
1075 if (codepage) { | 1075 if (codepage) { |
1076 char* tmpbuf; | 1076 char* tmpbuf; |
1077 tmpbuf = sub_recode(buf, sz, codepage); | 1077 tmpbuf = sub_recode(buf, sz, codepage); |
1078 free(buf); | 1078 free(buf); |
1079 buf = tmpbuf; | 1079 buf = tmpbuf; |