Patch by Kostya, minor fixes by me.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@21958 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b