James Hutchinson 3489c19d2b Merge branch 'master' into highbitdepth ...

Conflicts:
	configure
	test/convolve_test.cc
	test/dct16x16_test.cc
	test/dct32x32_test.cc
	test/fdct4x4_test.cc
	test/fdct8x8_test.cc
	test/partial_idct_test.cc
	third_party/libyuv/README.libvpx
	vp9/common/vp9_enums.h
	vp9/common/vp9_idct.h
	vp9/common/vp9_rtcd_defs.pl
	vp9/decoder/vp9_decodeframe.c
	vp9/encoder/vp9_bitstream.c
	vp9/encoder/vp9_encodeframe.c
	vp9/encoder/vp9_encoder.c
	vp9/encoder/vp9_encoder.h
	vp9/encoder/vp9_extend.c
	vp9/encoder/vp9_quantize.c
	vp9/encoder/vp9_rd.c
	vp9/encoder/vp9_rdopt.c
	vp9/vp9_cx_iface.c
	vp9/vp9_dx_iface.c
	vp9/vp9_iface_common.h
	vpx/vp8cx.h
	vpx_scale/generic/yv12config.c
	vpxdec.c
	vpxenc.c

Change-Id: If4104c5a7cd0a29dd0bed7c3804837ba40ba7e0c

2014-08-19 10:58:02 -07:00

..

decode_to_md5.c

Renames interface field in VpxInterface

2014-07-15 16:55:12 -07:00

decode_with_drops.c

Renames interface field in VpxInterface

2014-07-15 16:55:12 -07:00

postproc.c

Renames interface field in VpxInterface

2014-07-15 16:55:12 -07:00

resize_util.c

move resize_util.c to examples/

2014-03-03 18:03:23 -08:00

set_maps.c

Renames interface field in VpxInterface

2014-07-15 16:55:12 -07:00

simple_decoder.c

Renames interface field in VpxInterface

2014-07-15 16:55:12 -07:00

simple_encoder.c

Merge branch 'master' into highbitdepth

2014-08-19 10:58:02 -07:00

twopass_encoder.c

Renames interface field in VpxInterface

2014-07-15 16:55:12 -07:00

vp8_multi_resolution_encoder.c

Fix build for examples/vp8_multi_resolution_encoder.

2014-07-07 16:59:07 -07:00

vp8cx_set_ref.c

Renames interface field in VpxInterface

2014-07-15 16:55:12 -07:00

vp9_spatial_svc_encoder.c

Added high bitdepth to SVC example

2014-07-22 10:59:59 +01:00

vpx_temporal_svc_encoder.c

Merge branch 'master' into highbitdepth

2014-08-19 10:58:02 -07:00