Merge pull request #9475 from FernetMenta/vdpau