diff options
| author | Igor Murashkin <iam@google.com> | 2013-02-27 20:43:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-27 20:43:26 +0000 |
| commit | 8b5c4ec7bbf253eb704094ab6b04f58923f67994 (patch) | |
| tree | 1abc45a9ded12752e9d2105129e852397702a5ac /media | |
| parent | 2c86f533c622e175b3ed77f40216a0891f9cc785 (diff) | |
| parent | c073ba525404f3416c2824c435d3d926a9892f1b (diff) | |
| download | frameworks_av-8b5c4ec7bbf253eb704094ab6b04f58923f67994.zip frameworks_av-8b5c4ec7bbf253eb704094ab6b04f58923f67994.tar.gz frameworks_av-8b5c4ec7bbf253eb704094ab6b04f58923f67994.tar.bz2 | |
Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index 82fb637..9499712 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -536,7 +536,7 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitH264() { size_t nalSize; bool foundSlice = false; while ((err = getNextNALUnit(&data, &size, &nalStart, &nalSize)) == OK) { - CHECK_GT(nalSize, 0u); + if (nalSize == 0) continue; unsigned nalType = nalStart[0] & 0x1f; bool flush = false; |