diff options
| author | Lajos Molnar <lajos@google.com> | 2014-12-09 23:44:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 23:44:50 +0000 |
| commit | 8ce2ac3c23438177d600ff90e0d6e29b0bd5e24c (patch) | |
| tree | 32a6af01220a574f789c18c4adc5f417fbbeb964 /media | |
| parent | 43486e80d5643f9324784a69a5f45a0923ceb711 (diff) | |
| parent | 853bc5a2379a59859795027a9dd4bc11a54b2a5f (diff) | |
| download | frameworks_av-8ce2ac3c23438177d600ff90e0d6e29b0bd5e24c.zip frameworks_av-8ce2ac3c23438177d600ff90e0d6e29b0bd5e24c.tar.gz frameworks_av-8ce2ac3c23438177d600ff90e0d6e29b0bd5e24c.tar.bz2 | |
am 853bc5a2: am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."
* commit '853bc5a2379a59859795027a9dd4bc11a54b2a5f':
Cast int64_t values to long long before print.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/codecs/aacdec/SoftAAC2.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp index 0546871..495bad0 100644 --- a/media/libstagefright/codecs/aacdec/SoftAAC2.cpp +++ b/media/libstagefright/codecs/aacdec/SoftAAC2.cpp @@ -876,7 +876,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { *nextTimeStamp += mStreamInfo->aacSamplesPerFrame * 1000000ll / mStreamInfo->sampleRate; ALOGV("adjusted nextTimeStamp/size to %lld/%d", - *nextTimeStamp, *currentBufLeft); + (long long) *nextTimeStamp, *currentBufLeft); } else { // move to next timestamp in list if (mBufferTimestamps.size() > 0) { @@ -885,7 +885,7 @@ void SoftAAC2::onQueueFilled(OMX_U32 /* portIndex */) { mBufferSizes.removeAt(0); currentBufLeft = &mBufferSizes.editItemAt(0); ALOGV("moved to next time/size: %lld/%d", - *nextTimeStamp, *currentBufLeft); + (long long) *nextTimeStamp, *currentBufLeft); } // try to limit output buffer size to match input buffers // (e.g when an input buffer contained 4 "sub" frames, output |