tree 4fbec11f9597481dd180ad08df44306e736e509f
parent 0071d87e243d5f1612dc1e31b4caa1fe191fea90
author Wei Jia <wjia@google.com> 1439867597 -0700
committer The Android Automerger <android-build@android.com> 1441160402 -0700

SoftAVCEncoder: fix auto merge error, member names have changed.

Bug: 20674674
Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6