split up into the following commits r22523, r22524, r22526 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22526 b3059339-0415-0410-9bf9-f77b7e298cf2