Yaowu Xu dab7515aa4 Merge branch 'master' into nextgenv2 ...

With a few manual fixes of merge conflicts.

Change-Id: I0dd65ff90f9fa8606e5563f528659e2607b12376

2015-12-16 09:00:57 -08:00

..

decodeframe.c

Merge branch 'master' into nextgenv2

2015-12-16 09:00:57 -08:00

decodeframe.h

VP9Decoder -> VP10Decoder

2015-08-13 14:43:55 -07:00

decodemv.c

Enable adaptive prediction mode coding

2015-12-10 09:02:32 -08:00

decodemv.h

VP9Decoder -> VP10Decoder

2015-08-13 14:43:55 -07:00

decoder.c

Added 3 more reference frames for inter prediction.

2015-11-20 17:00:24 -08:00

decoder.h

VP10: Add palette mode part 1

2015-10-12 10:02:17 -07:00

detokenize.c

Bring palette back to nextgenv2

2015-12-07 18:24:15 -08:00

detokenize.h

Bring palette back to nextgenv2

2015-12-07 18:24:15 -08:00

dsubexp.c

Some fixes from merging MISC_FIXES config

2015-12-10 15:17:33 -08:00

dsubexp.h

Correct guard macros in header files

2015-08-13 09:25:39 -07:00

dthread.c

Replace MAX_REF_LF_DELTAS with MAX_REF_FRAMES

2015-08-20 09:52:52 -07:00

dthread.h

vp10: add extern "C" to headers

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