tree f9bdb81b39dbae26d9c3d1ad4b0d3a9eb7d375c8
parent a03f8fb7d0ba9aa8991f47358a792a9cbe708c4b
parent 693a430cff3c9fac503b5005e9fd5419611eddde
author James Dong <jdong@google.com> 1285262901 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285262901 -0700

am 693a430c: am 903fc221: Ignore errors from correction parameter query and config for M4v and H263 encoders

Merge commit '693a430cff3c9fac503b5005e9fd5419611eddde'

* commit '693a430cff3c9fac503b5005e9fd5419611eddde':
  Ignore errors from correction parameter query and config for M4v and H263 encoders