diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 14:33:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-15 14:33:48 +0000 |
| commit | 6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66 (patch) | |
| tree | 3a163426164ba12d8395a895a21ebf43a72ac705 /media/libstagefright/matroska | |
| parent | 29fe1ea4b5a1d1fc1fb87b53866901357c04c5c1 (diff) | |
| parent | 432ed3d66d09464778df31c73374ee897f7b8840 (diff) | |
| download | frameworks_av-6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66.zip frameworks_av-6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66.tar.gz frameworks_av-6bb7a89102a8966ee032d6ddc0b3ff4f1a47ef66.tar.bz2 | |
am 432ed3d6: Merge "libstagefright: fix 64-bit warnings"
* commit '432ed3d66d09464778df31c73374ee897f7b8840':
libstagefright: fix 64-bit warnings
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 c3b4d59..0e4dd2b 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; |