[MPlayer-dev-eng] [PATCH] Fix handling of option 'subfont-encoding'

Ingo Brückl ib at wupperonline.de
Tue Jan 21 19:06:22 CET 2014


The handling seems broken. These are the patches to fix it.

#1:
If variable unicode hasn't been set true (line 991), there *is* a
subtitle_font_encoding, so it's pointless to have a fallback to
"iso-8859-1".
Remove this fallback and simplify the code.

#2:
prepare_charset_unicode() is supposed to work without iconv which it does
indeed. So, relocate the function definition by moving it out of the '#ifdef
CONFIG_ICONV' block.
As a result, charset_size can be uninitialized and charmap may be unused. Fix
them both.

#3:
Revise the man page.

Works for me with FreeType and without setting subfont-encoding (or using
value unicode) and -utf8 after #undef'ing CONFIG_ICONV just fine.

Ingo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: font_load_ft.#1.patch
Type: text/x-diff
Size: 817 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20140121/853c994b/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: font_load_ft.#2.patch
Type: text/x-diff
Size: 3419 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20140121/853c994b/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: font_load_ft.#3.patch
Type: text/x-diff
Size: 885 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20140121/853c994b/attachment-0002.bin>


More information about the MPlayer-dev-eng mailing list