diff options
| author | Andy Hung <hunga@google.com> | 2014-09-25 18:32:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 18:32:09 +0000 |
| commit | 3529b78d2b430aac5b8f1e48bd37c0201fb1d0f7 (patch) | |
| tree | 087d951f47e265f340fefb1c3ccc3a555854f426 /media/libstagefright | |
| parent | 376a8353901533268d21a0e2041c75cd9f2f04da (diff) | |
| parent | c0d17e349901c3ccf6d15b7dcdf7fa30139c9750 (diff) | |
| download | frameworks_av-3529b78d2b430aac5b8f1e48bd37c0201fb1d0f7.zip frameworks_av-3529b78d2b430aac5b8f1e48bd37c0201fb1d0f7.tar.gz frameworks_av-3529b78d2b430aac5b8f1e48bd37c0201fb1d0f7.tar.bz2 | |
am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into lmp-dev
* commit 'c0d17e349901c3ccf6d15b7dcdf7fa30139c9750':
NuPlayer: Fix decoder error handling
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/foundation/AMessage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/foundation/AMessage.cpp b/media/libstagefright/foundation/AMessage.cpp index bc3e3fb..795e8a6 100644 --- a/media/libstagefright/foundation/AMessage.cpp +++ b/media/libstagefright/foundation/AMessage.cpp @@ -485,7 +485,7 @@ AString AMessage::debugString(int32_t indent) const { { sp<ABuffer> buffer = static_cast<ABuffer *>(item.u.refValue); - if (buffer != NULL && buffer->size() <= 64) { + if (buffer != NULL && buffer->data() != NULL && buffer->size() <= 64) { tmp = StringPrintf("Buffer %s = {\n", item.mName); hexdump(buffer->data(), buffer->size(), indent + 4, &tmp); appendIndent(&tmp, indent + 2); |