summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-02-07 21:28:28 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-07 21:28:28 +0000
commit429f2bf7527daf872a1bbdafca8ad28635b84644 (patch)
tree62d36d2b5fbbcfdf84197ddd09cc245e13ff502a /media/libstagefright/mpeg2ts
parent5ef74dce64a1b70534547c044a6d15533f4a9dca (diff)
parente2307ccbab9c32a7806f15c2572cfe6ec428f2f5 (diff)
downloadframeworks_av-429f2bf7527daf872a1bbdafca8ad28635b84644.zip
frameworks_av-429f2bf7527daf872a1bbdafca8ad28635b84644.tar.gz
frameworks_av-429f2bf7527daf872a1bbdafca8ad28635b84644.tar.bz2
am e2307ccb: Merge "frameworks/av: fix errors inside ALOGV"
* commit 'e2307ccbab9c32a7806f15c2572cfe6ec428f2f5': frameworks/av: fix errors inside ALOGV
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/ESQueue.cpp2
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;