diff options
author | Narayan Kamath <narayan@google.com> | 2014-02-11 13:47:53 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-02-11 13:53:20 +0000 |
commit | 1d6fa7af1288b550faabe4ec2cf98684236723db (patch) | |
tree | a8801ca9a0925ba1faccf17acea4aa78d71a9d29 /cmds/stagefright/muxer.cpp | |
parent | b82a9f105f89d6b3684c9f626918042bd8977912 (diff) | |
parent | 566be7c33fc56ae4c34168ecbee5316374f7e3c5 (diff) | |
download | frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.zip frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.tar.gz frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.tar.bz2 |
resolved conflicts for merge of 566be7c3 to master
Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
Diffstat (limited to 'cmds/stagefright/muxer.cpp')
-rw-r--r-- | cmds/stagefright/muxer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/stagefright/muxer.cpp b/cmds/stagefright/muxer.cpp index c0747f8..f4a33e8 100644 --- a/cmds/stagefright/muxer.cpp +++ b/cmds/stagefright/muxer.cpp @@ -16,6 +16,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "muxer" +#include <inttypes.h> #include <utils/Log.h> #include <binder/ProcessState.h> @@ -199,7 +200,7 @@ static int muxing( trackIndexMap.clear(); int64_t elapsedTimeUs = ALooper::GetNowUs() - muxerStartTimeUs; - fprintf(stderr, "SUCCESS: muxer generate the video in %lld ms\n", + fprintf(stderr, "SUCCESS: muxer generate the video in %" PRId64 " ms\n", elapsedTimeUs / 1000); return 0; |