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

..

vp9_decodeframe.c

Merged branch 'master' into nextgenv2

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

vp9_decodeframe.h

vpx_dsp/bitreader.h: vp9_->vpx_

2015-07-20 18:06:31 -07:00

vp9_decodemv.c

Include vpx_dsp_common.h when using VPXMIN/MAX

2015-08-31 14:36:35 -07:00

vp9_decodemv.h

vpx_dsp/bitreader.h: vp9_->vpx_

2015-07-20 18:06:31 -07:00

vp9_decoder.c

Merged branch 'master' into nextgenv2

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

vp9_decoder.h

Merged branch 'master' into nextgenv2

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

vp9_detokenize.c

vpx_dsp/bitreader.h: vp9_->vpx_

2015-07-20 18:06:31 -07:00

vp9_detokenize.h

vpx_dsp/bitreader.h: vp9_->vpx_

2015-07-20 18:06:31 -07:00

vp9_dsubexp.c

vpx_dsp/bitreader.h: vp9_->vpx_

2015-07-20 18:06:31 -07:00

vp9_dsubexp.h

vpx_dsp/bitreader.h: vp9_->vpx_

2015-07-20 18:06:31 -07:00

vp9_dthread.c

Use vpx prefix for codec independent threading functions

2015-07-02 00:47:54 +00:00

vp9_dthread.h

vp9: add extern "C" to headers

2015-09-09 23:15:59 -07:00