diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-04 11:54:28 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-02-04 11:54:28 -0800 |
| commit | a1e8944a21e5833b7aadc451776f11797f5f9273 (patch) | |
| tree | b7f4c150346d21f4862f231160c7df6602509a12 /media/libstagefright/wifi-display/VideoFormats.cpp | |
| parent | 16e8d463bc5c8805ae6815c67875b16d177a9d8a (diff) | |
| download | frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.zip frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.tar.gz frameworks_av-a1e8944a21e5833b7aadc451776f11797f5f9273.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/wifi-display/VideoFormats.cpp')
| -rw-r--r-- | media/libstagefright/wifi-display/VideoFormats.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/wifi-display/VideoFormats.cpp b/media/libstagefright/wifi-display/VideoFormats.cpp index 04e02c1..2f4af5b 100644 --- a/media/libstagefright/wifi-display/VideoFormats.cpp +++ b/media/libstagefright/wifi-display/VideoFormats.cpp @@ -435,7 +435,7 @@ AString VideoFormats::getFormatSpec(bool forM4Message) const { // max-hres (none or 2 byte) // max-vres (none or 2 byte) - return StringPrintf( + return AStringPrintf( "%02x 00 %02x %02x %08x %08x %08x 00 0000 0000 00 none none", forM4Message ? 0x00 : ((mNativeIndex << 3) | mNativeType), mConfigs[mNativeType][mNativeIndex].profile, |