diff options
| author | Zach Jang <zachjang@google.com> | 2016-04-21 16:10:50 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@android.com> | 2016-04-21 19:17:47 -0700 |
| commit | 45737cb776625f17384540523674761e6313e6d4 (patch) | |
| tree | 88e7630fe2dc647ff241349d668dcb9271f57751 /media/libstagefright/include | |
| parent | 2b6f22dc64d456471a1dc6df09d515771d1427c8 (diff) | |
| download | frameworks_av-45737cb776625f17384540523674761e6313e6d4.zip frameworks_av-45737cb776625f17384540523674761e6313e6d4.tar.gz frameworks_av-45737cb776625f17384540523674761e6313e6d4.tar.bz2 | |
Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-release
Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/SampleTable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/include/SampleTable.h b/media/libstagefright/include/SampleTable.h index 460492b..3764adb 100644 --- a/media/libstagefright/include/SampleTable.h +++ b/media/libstagefright/include/SampleTable.h @@ -24,6 +24,7 @@ #include <media/stagefright/MediaErrors.h> #include <utils/RefBase.h> #include <utils/threads.h> +#include <utils/Vector.h> namespace android { @@ -111,7 +112,7 @@ private: uint32_t mNumSampleSizes; uint32_t mTimeToSampleCount; - uint32_t *mTimeToSample; + Vector<uint32_t> mTimeToSample; struct SampleTimeEntry { uint32_t mSampleIndex; |