James Hutchinson 939f871ccc Merge branch 'master' into highbitdepth ...

Conflicts:
	configure
	test/dct16x16_test.cc
	test/dct32x32_test.cc
	test/fdct4x4_test.cc
	test/fdct8x8_test.cc
	test/partial_idct_test.cc
	vp9/common/vp9_blockd.h
	vp9/common/vp9_idct.h
	vp9/common/vp9_rtcd_defs.pl
	vp9/decoder/vp9_decodeframe.c
	vp9/encoder/vp9_aq_complexity.c
	vp9/encoder/vp9_block.h
	vp9/encoder/vp9_dct.c
	vp9/encoder/vp9_encodeframe.c
	vp9/encoder/vp9_encodemb.c
	vp9/encoder/vp9_encoder.c
	vp9/encoder/vp9_firstpass.c
	vp9/encoder/vp9_pickmode.c
	vp9/encoder/vp9_quantize.c
	vp9/encoder/vp9_quantize.h
	vp9/encoder/vp9_ratectrl.c
	vp9/vp9_cx_iface.c

Change-Id: I402e1e91c6207c41a5bc1508ccfceec62196772b

2014-06-24 09:58:17 -07:00

..

arm/neon

Remove the vp8_vpxyv12_copy_y_neon.

2014-03-14 16:47:23 -07:00

generic

Merge branch 'master' into highbitdepth

2014-06-24 09:58:17 -07:00

mips/dspr2

Add non420 support to vp9_extend_frame_borders.

2014-06-11 12:02:59 -07:00

win32

Use 'vpx_scale' consistently

2012-12-05 16:05:44 -08:00

vpx_scale_asm_offsets.c

Update ARM for vpx_scale changes

2012-12-05 08:59:17 -08:00

vpx_scale_rtcd.c

Rename vpx_scale/rtcd.c to vpx_scale/vpx_scale_rtcd.c

2012-11-30 15:53:17 -08:00

vpx_scale_rtcd.pl

Only build neon assembly for armv7 targets

2014-05-12 08:52:02 -07:00

vpx_scale.h

{,vpx_scale}: normalize include guards

2013-12-16 19:41:13 -08:00

vpx_scale.mk

Only build neon assembly for armv7 targets

2014-05-12 08:52:02 -07:00

yv12config.h

Added initial support for 16-bit framebuffers.

2014-04-28 22:11:19 -07:00