Skip to content
Snippets Groups Projects
Commit 44d35f7b authored by John Koleszar's avatar John Koleszar
Browse files

Merge branch 'origin/eider' into master

Conflicts:
	vp8/common/entropymode.c
	vp8/common/entropymode.h
	vp8/encoder/encodeframe.c
	vp8/vp8_cx_iface.c

Change-Id: I708b0f30449b9502b382e47b745d56f5ed2ce265
parents c7ca3808 297dc902
Loading
Showing
with 232 additions and 90 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment