summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-04 20:14:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-04 20:14:50 +0000
commite91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7 (patch)
tree9e7913af62ee68d339a399723f83c4ef05b79d32 /cmds
parent7bc903581f879c86f3881a2f7563bd28c1ac29b7 (diff)
parent6a025acb630a3ac4a84715d188aeb48f1946bc3f (diff)
downloadframeworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.zip
frameworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.tar.gz
frameworks_av-e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7.tar.bz2
am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."
* commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f': Move AString's StringPrintf out of the way.
Diffstat (limited to 'cmds')
-rw-r--r--cmds/stagefright/SimplePlayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/stagefright/SimplePlayer.cpp b/cmds/stagefright/SimplePlayer.cpp
index 1b2f792..4b2f980 100644
--- a/cmds/stagefright/SimplePlayer.cpp
+++ b/cmds/stagefright/SimplePlayer.cpp
@@ -332,7 +332,7 @@ status_t SimplePlayer::onPrepare() {
size_t j = 0;
sp<ABuffer> buffer;
- while (format->findBuffer(StringPrintf("csd-%d", j).c_str(), &buffer)) {
+ while (format->findBuffer(AStringPrintf("csd-%d", j).c_str(), &buffer)) {
state->mCSD.push_back(buffer);
++j;