Jingning Han c4e807ae2f Fix compiling errors due to git merge ...

There were a few conflicts between the new non-RD partition search
and recent clean-up patches, which were not caught by git control.
This commit fixed these issues.

Change-Id: Ieebefbd6c19d81d0d13e3c568877d5cce2ab7797

2014-03-25 10:25:16 -07:00

..

common

Merge "Fixed a build issue"

2014-03-25 10:22:18 -07:00

decoder

Merge "Align threading LFWorkerData to 32 bytes."

2014-03-24 17:19:48 -07:00

encoder

Fix compiling errors due to git merge

2014-03-25 10:25:16 -07:00

exports_dec

support building vp8 and vp9 into a single lib

2012-11-15 10:46:17 -08:00

exports_enc

Removing vpx_codec_vp9x_cx and internal experimental flag.

2013-12-27 14:01:12 -08:00

vp9_common.mk

Removing vp9_onyx.h and moving its content to the encoder.

2014-03-05 23:33:22 -08:00

vp9_cx_iface.c

Removing output_partition from vp9.

2014-03-21 16:10:51 -07:00

vp9_dx_iface.c

Merge "General cleanup in vp9_decoder.{h, c}."

2014-03-24 15:56:25 -07:00

vp9_iface_common.h

Merge "Tidy up comments & remove commented out code."

2014-01-22 11:14:07 -08:00

vp9cx.mk

Merge "vp9_write_bit_buffer.h header statics converted to globals"

2014-03-24 14:18:24 -07:00

vp9dx.mk

Merge "Renaming vp9_onyxd.h and vp9_onyxd_if.c to vp9_decoder.{h, c}."

2014-03-10 12:11:09 -07:00