ref: 8c31484ea1fbac128e31a951a004f6f91bc1ef2f
parent: 1c24eb2b7b3a61893ea19e9e544c24a233f89921
author: Yaowu Xu <yaowu@google.com>
date: Wed Jul 20 10:21:24 EDT 2011
fix more merge issues With this fix, the experimental branch now builds and encodes correctly with the following two configure options respectively: --enable-experimental --enable-t8x8 --enable-experimental Change-Id: I3147c33c503fe713a85fd371e4f1a974805778bf