diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2014-11-06 17:49:48 -0800 |
commit | e1a2df553a6d151807a5da738a3cd853bef908d9 (patch) | |
tree | 9015c1c9ad9ec69f1962657f70fe3df386fbb05a /media/libstagefright/AACWriter.cpp | |
parent | bcf093bfef277a8ec0119da9e84e5abac58ad0b1 (diff) | |
parent | 841daebc75fbf5e7fb4dd71cab559b8f4d7150ae (diff) | |
download | frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.zip frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.gz frameworks_av-e1a2df553a6d151807a5da738a3cd853bef908d9.tar.bz2 |
Resolve conflict
Diffstat (limited to 'media/libstagefright/AACWriter.cpp')
-rw-r--r-- | media/libstagefright/AACWriter.cpp | 12 |
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; |