diff options
author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 22:35:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 22:35:00 +0000 |
commit | e80631aa1992ca50af679cd6a018c0ffda7f9b17 (patch) | |
tree | 6b3fcc9fbb5b02976e4bb2163e994952303bead5 /libvideoeditor/lvpp/DummyVideoSource.cpp | |
parent | d4a3cae8cc4cf924925ae57723e61c89f6c4fd51 (diff) | |
parent | 839d11d1f7be9dff2f06c7d30a9eb39cb6782078 (diff) | |
download | frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.zip frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.gz frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.bz2 |
am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Diffstat (limited to 'libvideoeditor/lvpp/DummyVideoSource.cpp')
-rwxr-xr-x | libvideoeditor/lvpp/DummyVideoSource.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libvideoeditor/lvpp/DummyVideoSource.cpp b/libvideoeditor/lvpp/DummyVideoSource.cpp index b06f937..6dbcf2a 100755 --- a/libvideoeditor/lvpp/DummyVideoSource.cpp +++ b/libvideoeditor/lvpp/DummyVideoSource.cpp @@ -16,6 +16,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "DummyVideoSource" +#include <inttypes.h> #include <stdlib.h> #include <utils/Log.h> #include <media/stagefright/foundation/ADebug.h> @@ -146,7 +147,7 @@ status_t DummyVideoSource::read( if (mIsFirstImageFrame) { M4OSA_clockGetTime(&mImagePlayStartTime, kTimeScale); mFrameTimeUs = (mImageSeekTime + 1); - ALOGV("read: jpg 1st frame timeUs = %lld, begin cut time = %ld", + ALOGV("read: jpg 1st frame timeUs = %lld, begin cut time = %" PRIu32, mFrameTimeUs, mImageSeekTime); mIsFirstImageFrame = false; |