EDI: synchronize code with implementation in Daala
s/plusOffset/plus/g