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/recordvideo.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/recordvideo.cpp')
| -rw-r--r-- | cmds/stagefright/recordvideo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/stagefright/recordvideo.cpp b/cmds/stagefright/recordvideo.cpp index c30c122..1d267f9 100644 --- a/cmds/stagefright/recordvideo.cpp +++ b/cmds/stagefright/recordvideo.cpp @@ -16,6 +16,7 @@ #include "SineSource.h" +#include <inttypes.h> #include <binder/ProcessState.h> #include <media/stagefright/foundation/ADebug.h> #include <media/stagefright/AudioPlayer.h> @@ -312,7 +313,7 @@ int main(int argc, char **argv) { fprintf(stderr, "record failed: %d\n", err); return 1; } - fprintf(stderr, "encoding %d frames in %lld us\n", nFrames, (end-start)/1000); + fprintf(stderr, "encoding %d frames in %" PRId64 " us\n", nFrames, (end-start)/1000); fprintf(stderr, "encoding speed is: %.2f fps\n", (nFrames * 1E9) / (end-start)); return 0; } |