forward port from 0.9 and enable videoflip now that it works