Yaowu Xu 7c514e2dfd Merged branch 'master' into nextgenv2 ...

Resolved Conflicts in the following files:
        configure
        vp10/common/idct.c
        vp10/encoder/dct.c
        vp10/encoder/encodemb.c
        vp10/encoder/rdopt.c

Change-Id: I4cb3986b0b80de65c722ca29d53a0a57f5a94316

2015-09-29 16:17:32 -07:00

..

generic

Merge "Change vp9_ prefix function names in vpx_scale to vpx_"

2015-08-15 22:40:11 +00:00

mips/dspr2

Change vp9_ prefix function names in vpx_scale to vpx_

2015-08-14 15:27:43 -07:00

vpx_scale_rtcd.c

Reorganize *_rtcd() calling conventions

2015-04-15 11:12:05 -04:00

vpx_scale_rtcd.pl

Change vp9_ prefix function names in vpx_scale to vpx_

2015-08-14 15:27:43 -07:00

vpx_scale.h

{,vpx_scale}: normalize include guards

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

vpx_scale.mk

fix building with --disable-spatial-resampling

2014-12-05 19:08:36 -08:00

yv12config.h

Merged branch 'master' into nextgenv2

2015-09-29 16:17:32 -07:00