summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
diff options
context:
space:
mode:
authorWei Jia <wjia@google.com>2014-12-16 23:33:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-16 23:33:13 +0000
commit3feb7bd0670b6e85d6eec25309d8606a99f1af31 (patch)
tree36a4eee69e1343fd9399f2a7bbca52b5c8df65d6 /media/libstagefright/mpeg2ts
parent70043ec5e8c79803972686577a9d36431019c15f (diff)
parent5c82407e3bb202c20c01107a4549f0d80d719ad8 (diff)
downloadframeworks_av-3feb7bd0670b6e85d6eec25309d8606a99f1af31.zip
frameworks_av-3feb7bd0670b6e85d6eec25309d8606a99f1af31.tar.gz
frameworks_av-3feb7bd0670b6e85d6eec25309d8606a99f1af31.tar.bz2
am 5c82407e: am 184e63ff: Merge "ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose." into lmp-mr1-dev
* commit '5c82407e3bb202c20c01107a4549f0d80d719ad8': ESQueue: change warning message of one buffer containing multiple ADTS frames into verbose.
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/ESQueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/mpeg2ts/ESQueue.cpp b/media/libstagefright/mpeg2ts/ESQueue.cpp
index 73fe109..a605595 100644
--- a/media/libstagefright/mpeg2ts/ESQueue.cpp
+++ b/media/libstagefright/mpeg2ts/ESQueue.cpp
@@ -343,7 +343,7 @@ status_t ElementaryStreamQueue::appendData(
}
if (frameLength != size - startOffset) {
- ALOGW("First ADTS AAC frame length is %zd bytes, "
+ ALOGV("First ADTS AAC frame length is %zd bytes, "
"while the buffer size is %zd bytes.",
frameLength, size - startOffset);
}