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

[Reimar Döffinger]

On Tue, Jan 21, 2014 at 09:24:45PM +0100, Ingo Brückl wrote:
> Reimar Döffinger wrote on Tue, 21 Jan 2014 19:56:54 +0100:
> 
> > 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.
> >>
> >> #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.
> 
> Both fixed locally. Thanks for pointing out.

I forgot to say that all patches look ok otherwise.
Though I have some doubts about the non-iconv, non-unicode case.
The one is if it would be better to maybe just always do
prepare_charset_unicode anyway.
The other if a different error message wouldn't be more user-friendly.
These shouldn't block your changes though, it's already
better than the code that is there.