diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-04 20:14:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-04 20:14:50 +0000 |
| commit | e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7 (patch) | |
| tree | 9e7913af62ee68d339a399723f83c4ef05b79d32 /media/libstagefright/MediaCodec.cpp | |
| parent | 7bc903581f879c86f3881a2f7563bd28c1ac29b7 (diff) | |
| parent | 6a025acb630a3ac4a84715d188aeb48f1946bc3f (diff) | |
| download | frameworks_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 'media/libstagefright/MediaCodec.cpp')
| -rw-r--r-- | media/libstagefright/MediaCodec.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index c2381b4..eb323a4 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1706,7 +1706,7 @@ void MediaCodec::extractCSD(const sp<AMessage> &format) { size_t i = 0; for (;;) { sp<ABuffer> csd; - if (!format->findBuffer(StringPrintf("csd-%u", i).c_str(), &csd)) { + if (!format->findBuffer(AStringPrintf("csd-%u", i).c_str(), &csd)) { break; } @@ -2229,7 +2229,7 @@ status_t MediaCodec::amendOutputFormatWithCodecSpecificData( memcpy(csd->data() + 4, nalStart, nalSize); mOutputFormat->setBuffer( - StringPrintf("csd-%u", csdIndex).c_str(), csd); + AStringPrintf("csd-%u", csdIndex).c_str(), csd); ++csdIndex; } |