Commit 8a5b2b2b authored Aug 20, 2015 by Wei Jia Committed by Android Git Automerger Aug 20, 2015

am ddb63b46: am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d:...

am ddb63b46: am f8f0e0b7: am 562be234: am f076fabf: am 0af43510: am 2562495d: am a590baca: Merge commit \'6ae815e0\' into HEAD

* commit 'ddb63b46':
  libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

parents 16cb432a ddb63b46

media/libstagefright/MPEG4Extractor.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -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 {