osc: removed trailing whitespaces
Merge remote-tracking branch 'origin/lua_experiment' into lua_experiment
vo: fix build with #ifdef -> #if

Whoever had the idea of introducing mixed conventions for these
preprocessor symbols should be shot.
configure: fix typo
manpage: actually document --hwdec=auto
Revert "sub: support straight alpha additionally to premultiplied alpha"

This reverts commit 689a25003fc8098e5fdfbb2faefc0e18365d3acb, with some
adjustments to code that was added after that commit.

I just messed up big time. We don't need this, and in fact the commit
confused straight and premultiplied alpha at one point (just a simple
inverted condition due to an oversight), which is why it looked like
it was working.

In commit 2827295 I wrote:

   Also, libva can't decide whether it accepts straight or premultiplied
   alpha for OSD sub-pictures [...]

That was just me messing up and being severely confused by my own bugs.
VA API  uses premultiplied alpha, which by the way is nice and
thoughtful of the VA API devs.

Well, this was stupid. But in the end, I'm glad that I could actually
reduce codesize by a good amount again.
Merge remote-tracking branch 'origin/lua_experiment' into lua_experiment
Merge remote-tracking branch 'origin/master' into lua_experiment