summaryrefslogtreecommitdiffstats
path: root/cmds
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-04 14:47:28 -0700
committerMark Salyzyn <salyzyn@google.com>2014-04-15 13:18:22 -0700
commitdb43b34c3428e480f8c4c66e7e88f4001f37f91e (patch)
treebe194bf06c84b61f277a1c29c7499aa7862494a4 /cmds
parent1df2557ac95a6d8a087fb15f6f842dc049f2759b (diff)
downloadframeworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.zip
frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.tar.gz
frameworks_av-db43b34c3428e480f8c4c66e7e88f4001f37f91e.tar.bz2
media: 64 bit compile issues
- change internal sized types to use stdint.h - printf & scanf formats - size_t or unsigned int for iterators Change-Id: Id993a70d8bf54c667c5d652b34179a2c727ed446
Diffstat (limited to 'cmds')
-rw-r--r--cmds/stagefright/stagefright.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index 8efb39e..ab2c54b 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -14,16 +14,16 @@
* limitations under the License.
*/
+#include <inttypes.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
//#define LOG_NDEBUG 0
#define LOG_TAG "stagefright"
#include <media/stagefright/foundation/ADebug.h>
-#include <sys/time.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
#include "jpeg.h"
#include "SineSource.h"
@@ -50,8 +50,6 @@
#include <private/media/VideoFrame.h>
-#include <fcntl.h>
-
#include <gui/GLConsumer.h>
#include <gui/Surface.h>
#include <gui/SurfaceComposerClient.h>
@@ -647,7 +645,7 @@ static void dumpCodecProfiles(const sp<IOMX>& omx, bool queryDecoders) {
const CodecProfileLevel &profileLevel =
results[i].mProfileLevels[j];
- printf("%s%ld/%ld", j > 0 ? ", " : "",
+ printf("%s%" PRIu32 "/%" PRIu32, j > 0 ? ", " : "",
profileLevel.mProfile, profileLevel.mLevel);
}