Merge changes I00c3e823,If8bca004
authorPaul Wilkins <paulwilkins@google.com>
Tue, 8 Mar 2011 14:40:11 +0000 (06:40 -0800)
committerCode Review <code-review@webmproject.org>
Tue, 8 Mar 2011 14:40:11 +0000 (06:40 -0800)
* changes:
  Improved key frame detection.
  Improved KF insertion after fades to still.


Trivial merge