diff options
| author | Andreas Huber <andih@google.com> | 2009-10-13 10:41:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-13 10:41:03 -0700 |
| commit | b7a69ce8f2d05c523ad964e98f490fe3c060a420 (patch) | |
| tree | 5033dcbd0d4260f0028c9e2e53eb66414f286722 /include | |
| parent | 00f166dedca88a781e7a64c07a42451a213f04ed (diff) | |
| parent | fe324a61c39d5db59f09fdae81c808d7851841e6 (diff) | |
| download | frameworks_base-b7a69ce8f2d05c523ad964e98f490fe3c060a420.zip frameworks_base-b7a69ce8f2d05c523ad964e98f490fe3c060a420.tar.gz frameworks_base-b7a69ce8f2d05c523ad964e98f490fe3c060a420.tar.bz2 | |
am fe324a61: Merge change I8d87cd98 into eclair-mr2
Merge commit 'fe324a61c39d5db59f09fdae81c808d7851841e6' into eclair-mr2-plus-aosp
* commit 'fe324a61c39d5db59f09fdae81c808d7851841e6':
Fix various compiler warnings accumulated over time.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/SampleTable.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/media/stagefright/SampleTable.h b/include/media/stagefright/SampleTable.h index 808d142..34a0649 100644 --- a/include/media/stagefright/SampleTable.h +++ b/include/media/stagefright/SampleTable.h @@ -35,17 +35,17 @@ public: // type can be 'stco' or 'co64'. status_t setChunkOffsetParams( - uint32_t type, off_t data_offset, off_t data_size); + uint32_t type, off_t data_offset, size_t data_size); - status_t setSampleToChunkParams(off_t data_offset, off_t data_size); + status_t setSampleToChunkParams(off_t data_offset, size_t data_size); // type can be 'stsz' or 'stz2'. status_t setSampleSizeParams( - uint32_t type, off_t data_offset, off_t data_size); + uint32_t type, off_t data_offset, size_t data_size); - status_t setTimeToSampleParams(off_t data_offset, off_t data_size); + status_t setTimeToSampleParams(off_t data_offset, size_t data_size); - status_t setSyncSampleParams(off_t data_offset, off_t data_size); + status_t setSyncSampleParams(off_t data_offset, size_t data_size); //////////////////////////////////////////////////////////////////////////// |