diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-08 19:37:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-08 19:37:02 +0000 |
| commit | e09bf82465ff83f4da966b77d551367f7c050154 (patch) | |
| tree | 48f1fa8084b86bf3586aa6c2edabec5701116a28 /include | |
| parent | 1ed99f0c1b9d7c4fbf2a59b3aeeb4901cc536e5c (diff) | |
| parent | 6874ed79fd525cf5d6ec8a953475c14f5a185cb4 (diff) | |
| download | frameworks_av-e09bf82465ff83f4da966b77d551367f7c050154.zip frameworks_av-e09bf82465ff83f4da966b77d551367f7c050154.tar.gz frameworks_av-e09bf82465ff83f4da966b77d551367f7c050154.tar.bz2 | |
am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev
* commit '6874ed79fd525cf5d6ec8a953475c14f5a185cb4':
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]; |