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

[Reimar Döffinger]

On Tue, Jan 21, 2014 at 07:06:22PM +0100, Ingo Brückl wrote:
> 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.

I don't think "unicode" was always the default when it wasn't set.
But I guess it's ok.

> #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.

Why are you moving the whole function instead of just the #endif?
Also you change "ucs-4" to "UCS-4", some iconv implementation break
when you use the wrong casing, so I'd rather not do this kind of
change without good reason.