diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-09 23:18:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 23:18:16 +0000 |
| commit | ccc3113681e2878e9c3ef98215f51db79ac034cc (patch) | |
| tree | b2240321e71a4f20bfd81165df9cc58ac82059f8 /include | |
| parent | 230e8b2b843666c2803d6b3ea3a5276381b1ecfb (diff) | |
| parent | e09bf82465ff83f4da966b77d551367f7c050154 (diff) | |
| download | frameworks_av-ccc3113681e2878e9c3ef98215f51db79ac034cc.zip frameworks_av-ccc3113681e2878e9c3ef98215f51db79ac034cc.tar.gz frameworks_av-ccc3113681e2878e9c3ef98215f51db79ac034cc.tar.bz2 | |
am e09bf824: am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev
* commit 'e09bf82465ff83f4da966b77d551367f7c050154':
stagefright: preserve output format flags on format change
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index fcccc6d..4d4ce90 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -182,6 +182,7 @@ private: sp<ANativeWindow> mNativeWindow; sp<AMessage> mInputFormat; sp<AMessage> mOutputFormat; + sp<AMessage> mBaseOutputFormat; Vector<BufferInfo> mBuffers[2]; bool mPortEOS[2]; |