OSDN Git Service

Merge commit '6ae815e0' into HEAD
authorWei Jia <wjia@google.com>
Thu, 20 Aug 2015 16:42:08 +0000 (09:42 -0700)
committerWei Jia <wjia@google.com>
Thu, 20 Aug 2015 16:42:08 +0000 (09:42 -0700)
commita590baca031199327f6382347625dd232de2c95c
tree40c192b35abb2006e02b514fbb5a19fafc3370cd
parent5221133bfa1585b4488b01cad165627b1cd17077
parent6ae815e04f618207da9ce52e3c828492c33a7107
Merge commit '6ae815e0' into HEAD

libstagefright: fix overflow in MPEG4Source::parseSampleAuxiliaryInformationOffsets.

Bug: 23270724
(cherry picked from commit c51ab7dd82bf4e24666fc72a55e03e2f530204d5)

Change-Id: I44c642548ee6ba3745fb1f46d8645bece231035a
media/libstagefright/MPEG4Extractor.cpp