tree 8b1cc9e25587bd8041f1b2edb24144d5c0d8a22c
parent d9d6c465d94f64e3705f234fa3f53e0341bc2b41
author Wei Jia <wjia@google.com> 1439867597 -0700
committer Wei Jia <wjia@google.com> 1439867597 -0700

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

Bug: 20674674
Change-Id: I511c22d59789e1cc3a21fe13ea08ac3752e737c6