Resets changes to VAAPI.cpp, will be rebased later.
Confirming to coding standards.