OSDN Git Service

Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev...
authorChong Zhang <chz@google.com>
Tue, 18 Jul 2017 22:26:46 +0000 (22:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:26:46 +0000 (22:26 +0000)
commit5f3ac3898d3d7efe53ad38430694a2a4ca117f85
tree08c44ba02688d70b94ec6d737077c1cd780de85c
parent03fa67202fac9df24f9dbefa24c9f81f9f9e415d
parent98248c3f88a73bd93580f86c72642bfe9bf2a2db
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc
am: 98248c3f88

Change-Id: I87cf81565eefd8ed299014e7aa1e10a00daefc31
media/libstagefright/mpeg2ts/ESQueue.cpp