Yaowu Xu 8c31484ea1 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
2011-07-21 09:01:53 -07:00
..
2011-04-25 17:37:41 -04:00
2011-06-08 16:19:37 -04:00
2011-02-24 14:35:18 -05:00
2011-07-21 09:01:53 -07:00
2011-07-21 09:01:53 -07:00
2011-05-24 13:24:52 -04:00
2011-07-21 09:01:53 -07:00
2011-07-21 09:01:53 -07:00
2011-07-21 09:01:53 -07:00
2010-10-27 18:08:04 -07:00
2011-04-13 14:26:45 -04:00
2011-02-08 17:42:54 -05:00
2011-05-24 13:24:52 -04:00
2011-06-13 17:14:11 -04:00
2011-07-21 09:01:53 -07:00
2011-07-21 09:01:53 -07:00
2011-07-08 09:31:41 +03:00
2011-07-08 09:31:41 +03:00
2011-07-08 09:31:41 +03:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2011-05-12 11:08:16 -04:00
2011-07-21 09:01:53 -07:00
2011-07-18 11:48:05 -04:00
2011-06-27 09:43:21 -07:00
2011-07-21 09:01:53 -07:00
2011-07-21 09:01:53 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00
2011-05-06 00:13:59 -04:00
2010-10-27 18:08:04 -07:00
2010-10-27 18:08:04 -07:00