diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 23:37:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 23:37:19 +0000 |
| commit | 1b24cf32e02a1372e57b3a2a432bc0adfe496e6d (patch) | |
| tree | 220f4583ae1081df62fa5c861eed3e9e90a24515 /media/libstagefright/NuCachedSource2.cpp | |
| parent | 4845b69f70ff457be8d8908f6eb61e2af67e00d3 (diff) | |
| parent | e80631aa1992ca50af679cd6a018c0ffda7f9b17 (diff) | |
| download | frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.zip frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.gz frameworks_av-1b24cf32e02a1372e57b3a2a432bc0adfe496e6d.tar.bz2 | |
am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Diffstat (limited to 'media/libstagefright/NuCachedSource2.cpp')
| -rw-r--r-- | media/libstagefright/NuCachedSource2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/NuCachedSource2.cpp b/media/libstagefright/NuCachedSource2.cpp index 72ea32d..61cf0ad 100644 --- a/media/libstagefright/NuCachedSource2.cpp +++ b/media/libstagefright/NuCachedSource2.cpp @@ -648,7 +648,7 @@ void NuCachedSource2::updateCacheParamsFromString(const char *s) { ssize_t lowwaterMarkKb, highwaterMarkKb; int keepAliveSecs; - if (sscanf(s, "%d/%d/%d", + if (sscanf(s, "%zd/%zd/%d", &lowwaterMarkKb, &highwaterMarkKb, &keepAliveSecs) != 3) { ALOGE("Failed to parse cache parameters from '%s'.", s); return; |