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:41:13 +0000 (22:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Jul 2017 22:41:13 +0000 (22:41 +0000)
commit2b1df0008ab546db68325b523d89bd93647b4a4a
tree398663ce00904f3722c856469353806ec2d896d4
parent7da8bef65e809d46ded4115940bb46f29df02db3
parent8d579abf973dea7004ba995fca6c5f7bb59be3b2
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am: d371d08bcc am: 98248c3f88 am: 5f3ac3898d am: aafbda5a18 am: b226bba820
am: 8d579abf97

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