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:37:45 +0000 (22:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:37:45 +0000 (22:37 +0000)
commitb226bba82033bc2e822b0fcb75f941095e4d8265
tree081f1787b26ec35e608a5179193064aba5a32b02
parent0844e1a3e8d000f34ee5a9aa55c826f771fb971e
parentaafbda5a18de2f7f80b7151ddb35f072fdace413
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d
am: aafbda5a18

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