Merge pull request #4294 from FernetMenta/vdpau