Merge "remove remaining references to XMA"
authorJames Zern <jzern@google.com>
Tue, 12 Aug 2014 06:02:45 +0000 (23:02 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Tue, 12 Aug 2014 06:02:45 +0000 (23:02 -0700)
1  2 
vpx/vpx_encoder.h

Simple merge