diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-04-15 22:28:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-15 22:28:34 +0000 |
| commit | 839d11d1f7be9dff2f06c7d30a9eb39cb6782078 (patch) | |
| tree | a50053c391da8c02797158395f2ecfec83218855 /include | |
| parent | 1df2557ac95a6d8a087fb15f6f842dc049f2759b (diff) | |
| parent | 3ab368e0810d894dcbc0971350c095049478a055 (diff) | |
| download | frameworks_av-839d11d1f7be9dff2f06c7d30a9eb39cb6782078.zip frameworks_av-839d11d1f7be9dff2f06c7d30a9eb39cb6782078.tar.gz frameworks_av-839d11d1f7be9dff2f06c7d30a9eb39cb6782078.tar.bz2 | |
Merge changes I0a744dc7,Id993a70d
* changes:
media: use size_t for integer iterator to Vector::size()
media: 64 bit compile issues
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/FileSource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/FileSource.h b/include/media/stagefright/FileSource.h index d994cb3..be152e7 100644 --- a/include/media/stagefright/FileSource.h +++ b/include/media/stagefright/FileSource.h @@ -55,7 +55,7 @@ private: sp<DecryptHandle> mDecryptHandle; DrmManagerClient *mDrmManagerClient; int64_t mDrmBufOffset; - int64_t mDrmBufSize; + size_t mDrmBufSize; unsigned char *mDrmBuf; ssize_t readAtDRM(off64_t offset, void *data, size_t size); |