VAAPI: Save before commit... squash me later