Merge pull request #4641 from FernetMenta/vdpau