diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:21:00 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-05-02 19:21:00 +0200 |
| commit | eca582052ef000897f69d6d0bdd96c7a8aa59cda (patch) | |
| tree | 7472d8773c4bb9321fdd41d0aef057e30045e557 /media/libstagefright/avc_utils.cpp | |
| parent | 26718276fd99ef60d9646d79467d2bb3f2db5549 (diff) | |
| parent | dc7805b0c79d056385a076422894425984af2aa0 (diff) | |
| download | frameworks_av-replicant-6.0.zip frameworks_av-replicant-6.0.tar.gz frameworks_av-replicant-6.0.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/LineageOS/android_frameworks_av into replicant-6.0HEADreplicant-6.0-0001replicant-6.0
Diffstat (limited to 'media/libstagefright/avc_utils.cpp')
| -rw-r--r-- | media/libstagefright/avc_utils.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/media/libstagefright/avc_utils.cpp b/media/libstagefright/avc_utils.cpp index 98b5c0e..bf014ba 100644 --- a/media/libstagefright/avc_utils.cpp +++ b/media/libstagefright/avc_utils.cpp @@ -454,7 +454,10 @@ bool IsAVCReferenceFrame(const sp<ABuffer> &accessUnit) { size_t nalSize; bool bIsReferenceFrame = true; while (getNextNALUnit(&data, &size, &nalStart, &nalSize, true) == OK) { - CHECK_GT(nalSize, 0u); + if (nalSize == 0u) { + ALOGW("skipping empty nal unit from potentially malformed bitstream"); + continue; + } unsigned nalType = nalStart[0] & 0x1f; |