VAAPI: fix some cppcheck oddities
Merge pull request #5435 from fritsch/vaapi-cppcheck

VAAPI: fix some cppcheck oddities