granicus.if.org Git - libvpx/commit

Merge changes from topic 'fix-vp9-bitstream-test'

* changes:
  vp9_encoder_parms_get_to_decoder: cosmetics
  vp9...parms_get_to_decoder: remove unneeded func
  vp9...parms_get_to_decoder: fix EXPECT param order
  vp9_encoder_parms_get_to_decoder: delete dead code
  fix BitstreamParms test
  vp9_encoder_parms_get_to_decoder: remove vp10
  yuvconfig2image(): add explicit cast to avoid conv warning
  vp9/10 decoder_init: add missing alloc cast
  vp9/10: set color_space on preview frame
  vp10: add extern "C" to headers
  vp9: add extern "C" to headers

author	James Zern <jzern@google.com>
	Tue, 15 Sep 2015 23:14:34 +0000 (23:14 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 15 Sep 2015 23:14:34 +0000 (23:14 +0000)
commit	c667593e1ec6f43f9655ef5b41819df2e988dcbb
tree	f00c43a18718826dafe3c5398753960e5015a05f	tree \| snapshot
parent	9c82fc457e878d707c4ead686f2b6bb6be213b7f	commit \| diff
parent	ba317bc9dc1e3b03793689a3f2af622a018a9eeb	commit \| diff

vp10/encoder/encoder.c	diff1 \|	diff2 \|	blob \| history
vp10/vp10_dx_iface.c	diff1 \|	diff2 \|	blob \| history
vp9/encoder/vp9_encoder.c	diff1 \|	diff2 \|	blob \| history