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

clean up warnings when building arm with rtcd

2011-06-29 10:51:41 -04:00

generic

Add 8x8 transform to experimental branch

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

ppc

remove one set of 16x16 variance funcations

2011-06-09 11:23:05 -07:00

x86

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

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

asm_enc_offsets.c

use GCC inline magic

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

bitstream.c

fix more merge issues

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

bitstream.h

Add runtime CPU detection support for ARM.

2010-10-25 09:23:29 -04:00

block.h

Add 8x8 transform to experimental branch

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

boolhuff.c

Moved vp8_encode_bool into boolhuff.h

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

boolhuff.h

Moved vp8_encode_bool into boolhuff.h

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

dct.c

fix more merge issues

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

dct.h

Add 8x8 transform to experimental branch

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

encodeframe.c

fix more merge issues

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

encodeintra.c

Add 8x8 transform to experimental branch

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

encodeintra.h

Fix RT only build

2011-06-14 13:39:06 +03:00

encodemb.c

fix more merge issues

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

encodemb.h

Add 8x8 transform to experimental branch

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

encodemv.c

Use full-pixel MV in mvsadcost calculation

2011-04-01 16:41:58 -04:00

encodemv.h

Use full-pixel MV in mvsadcost calculation

2011-04-01 16:41:58 -04:00

ethreading.c

Add 8x8 transform to experimental branch

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

firstpass.c

Merge remote branch 'internal/upstream' into HEAD

2011-07-19 00:05:05 -04:00

firstpass.h

Move firstpass motion map to stats packet

2010-10-21 14:04:20 -04:00

lookahead.c

Refactor lookahead ring buffer

2011-04-13 14:26:45 -04:00

lookahead.h

Refactor lookahead ring buffer

2011-04-13 14:26:45 -04:00

mcomp.c

Adjust full-pixel clamping and motion vector limit calculation

2011-07-08 11:34:28 -04:00

mcomp.h

Bug fix in motion vector limit calculation

2011-06-30 11:20:13 -04:00

modecosts.c

Fix relative include paths

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

modecosts.h

Use WebM in copyright notice for consistency

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

onyx_if.c

fix more merge issues

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

onyx_int.h

fix more merge issues

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

pickinter.c

Minor change in pick_inter_mode()

2011-07-08 14:08:45 -04:00

pickinter.h

Move intra block mode selection to pickinter.c

2011-06-08 11:44:57 -04:00

picklpf.c

remove incorrect initialization

2011-06-29 11:54:27 -04:00

psnr.c

Merge remote branch 'internal/upstream' into HEAD

2011-03-23 00:27:52 -04:00

psnr.h

Increase static linkage, remove unused functions

2011-03-17 20:53:47 -04:00

quantize.c

fix more merge issues

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

quantize.h

fix more merge issues

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

ratectrl.c

Merge remote branch 'internal/upstream' into HEAD

2011-07-19 00:05:05 -04:00

ratectrl.h

Move pick_frame_size() to ratectrl.c

2011-04-26 16:49:54 -04:00

rdopt.c

fix more merge issues

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

rdopt.h

Add 8x8 transform to experimental branch

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

sad_c.c

Full search SAD function optimization in SSE4.1

2010-10-27 13:36:31 -04:00

segmentation.c

Use WebM in copyright notice for consistency

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

segmentation.h

Fix relative include paths

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

ssim.c

clean up unused variable warnings

2011-05-09 12:56:20 -04:00

temporal_filter.c

Merge "Reduce motion vector search on alt-ref frame."

2011-07-13 10:07:30 -07:00

temporal_filter.h

x86 sse2 temporal_filter_apply

2011-01-06 14:00:30 -05:00

tokenize.c

fix more merge issues

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

tokenize.h

fix more merge issues

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

treewriter.c

Use WebM in copyright notice for consistency

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

treewriter.h

Fix relative include paths

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

variance_c.c

remove redundant functions

2011-06-06 16:44:05 -07:00

variance.h

remove one set of 16x16 variance funcations

2011-06-09 11:23:05 -07:00