summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE Fix divide by zeroMarco Nelissen2016-12-121-5/+18
* Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-091-0/+13
|\
| * Limit mp4 atom size to something reasonableMarco Nelissen2016-09-271-0/+13
* | Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-1/+26
|\ \ | |/
| * MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as t...Wei Jia2016-05-271-0/+8
| * Check malloc result to avoid NPDMarco Nelissen2016-05-271-0/+18
| * Also fix out of bounds access for normal readMarco Nelissen2016-02-261-1/+9
* | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-1/+9
|\ \
| * | Also fix out of bounds access for normal readMarco Nelissen2016-03-011-1/+9
| * | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| |\ \
| | * \ Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | |\ \
| | | * \ Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: a8ac...Marco Nelissen2016-01-121-1/+9
| | | |\ \
| | | | * \ Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7eMarco Nelissen2016-01-121-1/+9
| | | | |\ \
| | | | | * \ Fix out-of-bounds write am: 5403587a74Marco Nelissen2016-01-121-1/+9
| | | | | |\ \
| | | | | | * \ Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | | | | |\ \
| | | | | | | * | Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | * | | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-211-1/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-211-1/+3
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into...Jon Larimer2015-10-201-1/+3
| | | | | | | |\ \
| | | | | | | | * | stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-10-021-1/+3
* | | | | | | | | | MPEG4Extractor: cast media time to int64_t in order to avoid check on unsigne...Wei Jia2016-03-221-1/+1
* | | | | | | | | | MPEG4Extractor: still more NULL dereference fixesJoshua J. Drake2016-03-221-0/+3
* | | | | | | | | | Merge tag 'android-6.0.1_r17' into HEADJessica Wagantall2016-03-071-1/+9
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Fix out-of-bounds writeMarco Nelissen2016-01-221-1/+9
| |/ / / / / / / /
| * | | | | | | | Fix offset adjustment when skipping off-spec meta chunkMarco Nelissen2015-10-221-3/+3
| |/ / / / / / /
* | | | | | | | stagefright: Don't crash on invalid / null AVCC atoms in MKVSteve Kondik2016-03-011-5/+7
* | | | | | | | stagefright: Fix tags in mpeg4 not parsed correctly.Keith Mok2015-11-301-1/+1
* | | | | | | | libstagefright: Handle MPEG4 DP playbackLeena Winterrowd2015-11-301-0/+3
* | | | | | | | libstagefright: Added mime-types for enca/encv atomsManikanta Kanamarlapudi2015-11-271-0/+6
* | | | | | | | Fix offset adjustment when skipping off-spec meta chunkMarco Nelissen2015-11-051-3/+3
* | | | | | | | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-051-2/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am f1790258: am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82:...Marco Nelissen2015-10-061-2/+9
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 5e92fded: am 64cdd5f2: am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e:...Marco Nelissen2015-10-061-2/+9
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am f2cf2bd7: am 07395f4c: am 00f5fa82: am 74d1927e: Merge "Check NAL size bef...Marco Nelissen2015-10-061-2/+9
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | | | | | |\ \
| | | | | | | * | Check NAL size before useMarco Nelissen2015-10-061-2/+9
| | | | | | | |/
| | * | | | | | am 3674abc0: am fb0d63df: am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e:...Wei Jia2015-10-061-0/+6
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 62d89908: am df68d9d5: am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: en...Wei Jia2015-10-061-0/+6
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not le...Wei Jia2015-10-061-0/+6
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not less than 8 for...Wei Jia2015-10-061-0/+6
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | MPEG4Extractor: ensure buffer size is not less than 8 for LastCommentData.Wei Jia2015-10-061-0/+6
| | | | | | |/
| | * | | | | am 2c02f5ee: am 719cd33e: am 492bba08: am d18bb120: am 09f71c56: am dedaca6f:...Marco Nelissen2015-08-241-4/+12
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoi...Marco Nelissen2015-08-231-4/+12
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | | |\ \ \ | | | | | |/ /
| | | | | * | am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | | | |\ \ | | | | | | |/
| | | | | | * Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-211-4/+12