diff options
| author | Andreas Huber <andih@google.com> | 2013-02-25 17:02:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-25 17:02:23 +0000 |
| commit | b4ac0ea6c45c04ac3e69d6b2243cfec58e858495 (patch) | |
| tree | 3186ed4d97a4bba9fd5e11445e685f1ca7cb747c | |
| parent | 0894bfb78b7872570b94d0b8d23ebbf6a8b51d35 (diff) | |
| parent | 2b56065a51c49a6235ac974c033c5751e8055869 (diff) | |
| download | frameworks_av-b4ac0ea6c45c04ac3e69d6b2243cfec58e858495.zip frameworks_av-b4ac0ea6c45c04ac3e69d6b2243cfec58e858495.tar.gz frameworks_av-b4ac0ea6c45c04ac3e69d6b2243cfec58e858495.tar.bz2 | |
Merge "Handles duplicated NAL start code to fix crash on HLS streams."
| -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; |