OSDN Git Service

am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4...
authorWei Jia <wjia@google.com>
Tue, 30 Jun 2015 18:21:32 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Jun 2015 18:21:32 +0000 (18:21 +0000)
commitbcd5edf99867b7bc10a3847d17cfb1e63b3b1764
tree4d7fe1c2625833eeb4cc1e9e6b86970ad5379d5b
parent6368e6d23ca27cd59a9a1876d6b5a2301a8657ed
parent13c925cab2decaed6786b0642f2b5a9f8516e71a
am 13c925ca: am 6ff53b96: Merge "Prevent integer overflow when processing covr MPEG4 atoms" into klp-dev

* commit '13c925cab2decaed6786b0642f2b5a9f8516e71a':
  Prevent integer overflow when processing covr MPEG4 atoms
media/libstagefright/MPEG4Extractor.cpp