OSDN Git Service

Merge \\\"Revert \\\"Impose a size bound for dynamically allocated tables in stbl...
authorWonsik Kim <wonsik@google.com>
Wed, 22 Jun 2016 18:36:14 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 18:36:14 +0000 (18:36 +0000)
commit4ef5122525e0ce7a4d3e16bb07c295340a813b00
tree681ce3d5db15f8161147c550662dd5dd03a8ff21
parent7e06799472dd93f3c4e33807ab41256e75287291
parent9d65d13cc7c207d4ef877df2834d4fbac74741ad
Merge \\\"Revert \\\"Impose a size bound for dynamically allocated tables in stbl.\\\"\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745
am: 9d65d13cc7

Change-Id: Ib8d8f9c58c1ffb169cf488d57fb841f80a664e97
include/media/stagefright/DataSource.h
media/libstagefright/SampleTable.cpp
media/libstagefright/include/SampleTable.h