diff options
| author | Wei Jia <wjia@google.com> | 2015-08-20 19:38:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 19:38:46 +0000 |
| commit | ddb63b46279a1bb3698cebb6c744013fc3bb17e2 (patch) | |
| tree | a4fa0e984cdcd3e512d5501e2e7eb08becf54c58 /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 1e97d490810211c6cfd0f731b209dd7b1dc65db4 (diff) | |
| parent | f8f0e0b756b0f96eccc94af89a0087c146232b26 (diff) | |
| download | frameworks_av-ddb63b46279a1bb3698cebb6c744013fc3bb17e2.zip frameworks_av-ddb63b46279a1bb3698cebb6c744013fc3bb17e2.tar.gz frameworks_av-ddb63b46279a1bb3698cebb6c744013fc3bb17e2.tar.bz2 | |
am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD
* commit 'f8f0e0b756b0f96eccc94af89a0087c146232b26':
libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rwxr-xr-x | media/libstagefright/MPEG4Extractor.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 16d7c2d..a76334f 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -44,6 +44,10 @@ #include <byteswap.h> #include "include/ID3.h" +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + namespace android { class MPEG4Source : public MediaSource { |