tree a6a3325313cc8d936222082341871bed0b6221e8
parent 21ba1fd5d895e23d3c15fc6c8edc71751ab51b7b
author Wei Jia <wjia@google.com> 1439867597 -0700
committer The Android Automerger <android-build@android.com> 1441243288 -0700

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

Bug: 20674674
Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6