Yaowu Xu 69f4930041 Merge branch 'master' into nextgenv2 ...

Conflicts:
	vp10/common/blockd.h
	vp10/common/entropymode.h
	vp10/common/reconintra.c
	vp10/decoder/decodemv.c
	vp10/encoder/bitstream.c
	vp10/encoder/encoder.h
	vp10/encoder/rd.c
	vp10/encoder/rdopt.c
	vp10/encoder/tokenize.h

Change-Id: Ic4891839b6f0474026d6d69821e38edec9632df1

2015-12-07 11:37:14 -08:00

..

decodeframe.c

Merge branch 'master' into nextgenv2

2015-12-07 11:37:14 -08:00

decodeframe.h

VP9Decoder -> VP10Decoder

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

decodemv.c

Merge branch 'master' into nextgenv2

2015-12-07 11:37:14 -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

Merge branch 'master' into nextgenv2

2015-12-07 11:37:14 -08:00

detokenize.h

Remove palette from VP10

2015-12-03 12:30:47 -08:00

dsubexp.c

Merge MISC_FIXES

2015-11-17 15:06:08 -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