Fix bad merge
authorJohn Koleszar <jkoleszar@google.com>
Mon, 11 Jun 2012 19:24:14 +0000 (12:24 -0700)
committerJohn Koleszar <jkoleszar@google.com>
Mon, 11 Jun 2012 19:24:14 +0000 (12:24 -0700)
commit52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7
tree3ab5874e0ca79170f2673da961241d5b60d73034
parent598759be1daeef71bb5644bbf617b798630f5db3
Fix bad merge

Change-Id: I45849dde0ee9b7e87fa32adb65ade8486bb66556
vp8/encoder/rdopt.c