[rbp/omxplayer] sync up with dvdplayer master changes
Merge pull request #2372 from huceke/raspberrypi

[rbp/omxplayer] sync up with dvdplayer master changes