Undone the last commit. Rewinded VLC again and added own fixes as separate patch.