Merge changes I1ebe76aa,Ia079b52b
authorJohn Koleszar <jkoleszar@google.com>
Wed, 18 Jan 2012 17:30:46 +0000 (09:30 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 18 Jan 2012 17:30:46 +0000 (09:30 -0800)
* changes:
  rdopt/pickinter: factor out some common setup
  rdopt: remove unused frame_lf_or_gf

1  2 
vp8/encoder/pickinter.c
vp8/encoder/rdopt.c

Simple merge
Simple merge