diff options
| author | Lajos Molnar <lajos@google.com> | 2014-02-03 18:02:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-03 18:02:49 +0000 |
| commit | df900f87eb09e2392d19216f09e0c168883d1004 (patch) | |
| tree | b5d684ae50dd8d03546c15b25350eda67dfd777a /media/libstagefright/ACodec.cpp | |
| parent | 8a8492147174c8b24a352787eb2d8282ef2860e8 (diff) | |
| parent | 324d9157a30f85fb12afa56b2230663ccdd61ced (diff) | |
| download | frameworks_av-df900f87eb09e2392d19216f09e0c168883d1004.zip frameworks_av-df900f87eb09e2392d19216f09e0c168883d1004.tar.gz frameworks_av-df900f87eb09e2392d19216f09e0c168883d1004.tar.bz2 | |
am 324d9157: am 5db1e3a6: Merge "correct one logic error in decide whether should render or not"
* commit '324d9157a30f85fb12afa56b2230663ccdd61ced':
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 cdb89cd..6c62fdf 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -3503,7 +3503,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; |