Merged DVDPlayer*.cpp changes into the patch.