From a1e8944a21e5833b7aadc451776f11797f5f9273 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 4 Feb 2015 11:54:28 -0800 Subject: Move AString's StringPrintf out of the way. We should come back and replace AString with std::string and switch to the "real" StringPrintf family, but this fixes the ODR violation that was preventing us from booting. Bug: 19265750 Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35 --- media/libstagefright/MediaCodec.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'media/libstagefright/MediaCodec.cpp') diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp index 5f55484..4367510 100644 --- a/media/libstagefright/MediaCodec.cpp +++ b/media/libstagefright/MediaCodec.cpp @@ -1685,7 +1685,7 @@ void MediaCodec::extractCSD(const sp &format) { size_t i = 0; for (;;) { sp csd; - if (!format->findBuffer(StringPrintf("csd-%u", i).c_str(), &csd)) { + if (!format->findBuffer(AStringPrintf("csd-%u", i).c_str(), &csd)) { break; } @@ -2208,7 +2208,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; } -- cgit v1.1