-
Thomas Daede authored
Conflicts: av1/encoder/block.h av1/encoder/encodeframe.c Change-Id: I941e7b9e76380f262b173928d3c5132c5613b3ce
debaface
Conflicts: av1/encoder/block.h av1/encoder/encodeframe.c Change-Id: I941e7b9e76380f262b173928d3c5132c5613b3ce