Updating to some changes from latest omxplayer sources