Updated to latest code from vlc clone