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 | fec2744fd6243b1329f52aa8a16c0768f24956b4 (patch) | |
| tree | 84f122dcf3f05f172961177aa949d19df7cc1687 /media | |
| parent | 68e6e24cb6cdd66c2209774c4871a2c47e8bbc8b (diff) | |
| parent | c9c47e48256fc1b79a77be8226ab9030920c0355 (diff) | |
| download | frameworks_av-fec2744fd6243b1329f52aa8a16c0768f24956b4.zip frameworks_av-fec2744fd6243b1329f52aa8a16c0768f24956b4.tar.gz frameworks_av-fec2744fd6243b1329f52aa8a16c0768f24956b4.tar.bz2 | |
Merge "Handles duplicated NAL start code to fix crash on HLS streams."
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; |