[ffmpeg/f40] Revert the mesa changes