summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/AACWriter.cpp
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-06-18 16:34:45 -0700
committerMark Salyzyn <salyzyn@google.com>2014-06-26 14:56:27 +0000
commita5750e0dad9e90f2195ce36f2c4457fa04b2b83e (patch)
treecba2a1ae57e4a61fba2fe3a39d6411aa731950ac /media/libstagefright/AACWriter.cpp
parentff17990df24913df9267c9c8b938178716298114 (diff)
downloadframeworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.zip
frameworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.tar.gz
frameworks_av-a5750e0dad9e90f2195ce36f2c4457fa04b2b83e.tar.bz2
libstagefright: 64-bit compile warnings
Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
Diffstat (limited to 'media/libstagefright/AACWriter.cpp')
-rw-r--r--media/libstagefright/AACWriter.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/media/libstagefright/AACWriter.cpp b/media/libstagefright/AACWriter.cpp
index deee8e7..353920e 100644
--- a/media/libstagefright/AACWriter.cpp
+++ b/media/libstagefright/AACWriter.cpp
@@ -14,6 +14,12 @@
* limitations under the License.
*/
+#include <fcntl.h>
+#include <inttypes.h>
+#include <sys/prctl.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+
//#define LOG_NDEBUG 0
#define LOG_TAG "AACWriter"
#include <utils/Log.h>
@@ -27,10 +33,6 @@
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MetaData.h>
#include <media/mediarecorder.h>
-#include <sys/prctl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
namespace android {
@@ -348,7 +350,7 @@ status_t AACWriter::threadFunc() {
mResumed = false;
}
timestampUs -= previousPausedDurationUs;
- ALOGV("time stamp: %lld, previous paused duration: %lld",
+ ALOGV("time stamp: %" PRId64 ", previous paused duration: %" PRId64,
timestampUs, previousPausedDurationUs);
if (timestampUs > maxTimestampUs) {
maxTimestampUs = timestampUs;