summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-02-04 20:21:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-04 20:21:01 +0000
commit0a08a1e0dd576f0682cf7d665fe940bc26af52d7 (patch)
tree746bd7b6a582058ec43637bb8f1934e27e4990f9 /cmds
parent4db561713aae35445c2551a1c1049e7a858af197 (diff)
parente91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7 (diff)
downloadframeworks_av-0a08a1e0dd576f0682cf7d665fe940bc26af52d7.zip
frameworks_av-0a08a1e0dd576f0682cf7d665fe940bc26af52d7.tar.gz
frameworks_av-0a08a1e0dd576f0682cf7d665fe940bc26af52d7.tar.bz2
am e91c3dd0: am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."
* commit 'e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7': 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;