diff options
| author | Colin Cross <ccross@google.com> | 2014-04-14 17:12:27 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-04-14 17:16:02 -0700 |
| commit | f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6 (patch) | |
| tree | 7278734ca980774c0ec5b5d6baa30a8587136eb0 /media/libstagefright/matroska | |
| parent | 9829344d526f87ca745208f04216ec795b239581 (diff) | |
| download | frameworks_av-f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6.zip frameworks_av-f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6.tar.gz frameworks_av-f6d0c1fd6d9e697bb3a891fae14c7e9d4b685de6.tar.bz2 | |
libstagefright: fix 64-bit warnings
%lld -> %" PRId64 " for int64_t
%d -> %zu for size_t
Also fixes some casts from void* to integer types, and some comparisons
between signed and unsigned.
(cherry picked from commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)
Change-Id: I76ba94d0b67776fd7abdc83b43d47c61d6c32f4c
Diffstat (limited to 'media/libstagefright/matroska')
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index 8f98b22..3647583 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -105,7 +105,7 @@ struct BlockIterator { private: MatroskaExtractor *mExtractor; - unsigned long mTrackNum; + long long mTrackNum; const mkvparser::Cluster *mCluster; const mkvparser::BlockEntry *mBlockEntry; |