diff options
author | Andreas Huber <andih@google.com> | 2014-02-07 15:36:10 -0800 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2014-02-11 11:41:07 -0800 |
commit | 84333e0475bc911adc16417f4ca327c975cf6c36 (patch) | |
tree | 4973c505d7c73d883c2cd796bc66ba96312c4a7a /media/libstagefright/avc_utils.cpp | |
parent | 1d6fa7af1288b550faabe4ec2cf98684236723db (diff) | |
download | frameworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.zip frameworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.tar.gz frameworks_av-84333e0475bc911adc16417f4ca327c975cf6c36.tar.bz2 |
warnings be gone.
Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
Diffstat (limited to 'media/libstagefright/avc_utils.cpp')
-rw-r--r-- | media/libstagefright/avc_utils.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/media/libstagefright/avc_utils.cpp b/media/libstagefright/avc_utils.cpp index b822868..c6ac0da 100644 --- a/media/libstagefright/avc_utils.cpp +++ b/media/libstagefright/avc_utils.cpp @@ -251,9 +251,7 @@ status_t getNextNALUnit( return OK; } -static sp<ABuffer> FindNAL( - const uint8_t *data, size_t size, unsigned nalType, - size_t *stopOffset) { +static sp<ABuffer> FindNAL(const uint8_t *data, size_t size, unsigned nalType) { const uint8_t *nalStart; size_t nalSize; while (getNextNALUnit(&data, &size, &nalStart, &nalSize, true) == OK) { @@ -293,7 +291,7 @@ sp<MetaData> MakeAVCCodecSpecificData(const sp<ABuffer> &accessUnit) { const uint8_t *data = accessUnit->data(); size_t size = accessUnit->size(); - sp<ABuffer> seqParamSet = FindNAL(data, size, 7, NULL); + sp<ABuffer> seqParamSet = FindNAL(data, size, 7); if (seqParamSet == NULL) { return NULL; } @@ -303,8 +301,7 @@ sp<MetaData> MakeAVCCodecSpecificData(const sp<ABuffer> &accessUnit) { FindAVCDimensions( seqParamSet, &width, &height, &sarWidth, &sarHeight); - size_t stopOffset; - sp<ABuffer> picParamSet = FindNAL(data, size, 8, &stopOffset); + sp<ABuffer> picParamSet = FindNAL(data, size, 8); CHECK(picParamSet != NULL); size_t csdSize = |