diff options
| author | Colin Cross <ccross@android.com> | 2014-02-10 12:51:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 12:51:29 +0000 |
| commit | 8497416c40bae877bc67b0ef30bb41a73af54711 (patch) | |
| tree | 34c4c44bab140953cfa9b3576f9a2a5e3c82f09d /media/libstagefright/mpeg2ts | |
| parent | 1dd3da08445ac96e64a1ca72ba0c11876cc4d631 (diff) | |
| parent | 429f2bf7527daf872a1bbdafca8ad28635b84644 (diff) | |
| download | frameworks_av-8497416c40bae877bc67b0ef30bb41a73af54711.zip frameworks_av-8497416c40bae877bc67b0ef30bb41a73af54711.tar.gz frameworks_av-8497416c40bae877bc67b0ef30bb41a73af54711.tar.bz2 | |
am 429f2bf7: am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"
* commit '429f2bf7527daf872a1bbdafca8ad28635b84644':
frameworks/av: fix errors inside ALOGV
Diffstat (limited to 'media/libstagefright/mpeg2ts')
| -rw-r--r-- | media/libstagefright/mpeg2ts/ESQueue.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp index ea79885..5c7e741 100644 --- a/media/libstagefright/mpeg2ts/ESQueue.cpp +++ b/media/libstagefright/mpeg2ts/ESQueue.cpp @@ -794,7 +794,9 @@ sp<ABuffer> ElementaryStreamQueue::dequeueAccessUnitH264() { dstOffset += pos.nalSize + 4; } +#if !LOG_NDEBUG ALOGV("accessUnit contains nal types %s", out.c_str()); +#endif const NALPosition &pos = nals.itemAt(nals.size() - 1); size_t nextScan = pos.nalOffset + pos.nalSize; |