diff options
| author | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-28 14:26:05 +0000 |
|---|---|---|
| committer | iive <iive@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-10-28 14:26:05 +0000 |
| commit | b43c16f8b68657d93ff920d5ec5a4a52a01f426a (patch) | |
| tree | 8cc55f5a9d518e05b55793c2845e2f07d8f00cb2 /libass | |
| parent | 41951932f92714d71f4c7f896dc40ed6fb869c45 (diff) | |
| download | mpv-b43c16f8b68657d93ff920d5ec5a4a52a01f426a.tar.bz2 mpv-b43c16f8b68657d93ff920d5ec5a4a52a01f426a.tar.xz | |
Our enca code uses strdup() on the input encoding name, as we don't modify it we can use the original constant string.
Uses less memory, code is simpler and faster.
Fixes memory leak (noticed by ulion).
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24879 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libass')
| -rw-r--r-- | libass/ass.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libass/ass.c b/libass/ass.c index e18a540a0d..de0dff8fe5 100644 --- a/libass/ass.c +++ b/libass/ass.c @@ -804,7 +804,7 @@ static char* sub_recode(char* data, size_t size, char* codepage) assert(codepage); { - char* cp_tmp = codepage ? strdup(codepage) : 0; + const char* cp_tmp = codepage; #ifdef HAVE_ENCA char enca_lang[3], enca_fallback[100]; if (sscanf(codepage, "enca:%2s:%99s", enca_lang, enca_fallback) == 2 @@ -816,9 +816,6 @@ static char* sub_recode(char* data, size_t size, char* codepage) mp_msg(MSGT_ASS,MSGL_V,"LIBSUB: opened iconv descriptor.\n"); } else mp_msg(MSGT_ASS,MSGL_ERR,MSGTR_LIBASS_ErrorOpeningIconvDescriptor); -#ifdef HAVE_ENCA - if (cp_tmp) free(cp_tmp); -#endif } { |