diff options
| author | Lajos Molnar <lajos@google.com> | 2014-03-07 01:34:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 01:34:19 +0000 |
| commit | 05a4b64ea4d01e29c427d8b5f5107b8edc2dbb21 (patch) | |
| tree | 24573f5a6b4ec3955901355c5ea8ff2f3388ddef /media/libstagefright/ACodec.cpp | |
| parent | 2db7eac5eb9b9e1b73d01640dc247dafe99a968e (diff) | |
| parent | 5db1e3a6f30c252ed61461dd8c58786e905e5f5a (diff) | |
| download | frameworks_av-05a4b64ea4d01e29c427d8b5f5107b8edc2dbb21.zip frameworks_av-05a4b64ea4d01e29c427d8b5f5107b8edc2dbb21.tar.gz frameworks_av-05a4b64ea4d01e29c427d8b5f5107b8edc2dbb21.tar.bz2 | |
am 5db1e3a6: Merge "correct one logic error in decide whether should render or not"
* commit '5db1e3a6f30c252ed61461dd8c58786e905e5f5a':
correct one logic error in decide whether should render or not
Diffstat (limited to 'media/libstagefright/ACodec.cpp')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index 5d5220f..3ee32ea 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3427,7 +3427,7 @@ void ACodec::BaseState::onOutputBufferDrained(const sp<AMessage> &msg) { int32_t render; if (mCodec->mNativeWindow != NULL && msg->findInt32("render", &render) && render != 0 - && (info->mData == NULL || info->mData->size() != 0)) { + && info->mData != NULL && info->mData->size() != 0) { // The client wants this buffer to be rendered. status_t err; |