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

..

arm

remove old armv5 code

2011-07-19 09:20:38 -04:00

generic

Add 8x8 transform to experimental branch

2011-07-20 09:49:22 -07:00

x86

fix --disable-runtime-cpu-detect on x86

2011-06-14 11:31:50 -04:00

asm_dec_offsets.c

use GCC inline magic

2011-06-08 16:19:37 -04:00

dboolhuff.c

Moved vp8_encode_bool into boolhuff.h

2011-07-19 09:17:25 -04:00

dboolhuff.h

Moved vp8_encode_bool into boolhuff.h

2011-07-19 09:17:25 -04:00

decodemv.c

fix more merge issues

2011-07-21 09:01:53 -07:00

decodemv.h

Use WebM in copyright notice for consistency

2010-09-09 10:01:21 -04:00

decoderthreading.h

vp8mt_alloc_temp_buffers: make prototype return void

2010-11-17 09:13:57 -05:00

decodframe.c

fix more merge issues

2011-07-21 09:01:53 -07:00

dequantize.c

fix more merge issues

2011-07-21 09:01:53 -07:00

dequantize.h

fix more merge issues

2011-07-21 09:01:53 -07:00

detokenize.c

fix more merge issues

2011-07-21 09:01:53 -07:00

detokenize.h

Add 8x8 transform to experimental branch

2011-07-20 09:49:22 -07:00

ec_types.h

Broken EC after MODE_INFO size reduction

2011-05-26 15:13:00 -04:00

error_concealment.c

Adding support for error concealment in multi-threaded decoding

2011-06-27 09:03:06 -04:00

error_concealment.h

Adding error-concealment to the decoder.

2011-05-19 13:46:33 -04:00

idct_blk.c

fix more merge issues

2011-07-21 09:01:53 -07:00

onyxd_if.c

fix more merge issues

2011-07-21 09:01:53 -07:00

onyxd_int.h

fix more merge issues

2011-07-21 09:01:53 -07:00

reconintra_mt.c

Fix relative include paths

2011-02-10 15:09:44 -05:00

reconintra_mt.h

Eliminate more warnings.

2010-10-27 18:08:04 -07:00

threading.c

New loop filter interface

2011-07-08 09:31:41 +03:00

treereader.h

Removed unused function vp8_treed_read_num

2011-06-07 09:32:51 -04:00