diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 22:35:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 22:35:00 +0000 |
| commit | e80631aa1992ca50af679cd6a018c0ffda7f9b17 (patch) | |
| tree | 6b3fcc9fbb5b02976e4bb2163e994952303bead5 /cmds | |
| parent | d4a3cae8cc4cf924925ae57723e61c89f6c4fd51 (diff) | |
| parent | 839d11d1f7be9dff2f06c7d30a9eb39cb6782078 (diff) | |
| download | frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.zip frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.gz frameworks_av-e80631aa1992ca50af679cd6a018c0ffda7f9b17.tar.bz2 | |
am 839d11d1: Merge changes I0a744dc7,Id993a70d
* commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078':
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/stagefright.cpp | 16 |
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); } |