OSDN Git Service

am e6ca5b2d: am 566c70ca: Guard against codecinfo overflow
authorMarco Nelissen <marcone@google.com>
Mon, 3 Aug 2015 20:12:12 +0000 (20:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Aug 2015 20:12:12 +0000 (20:12 +0000)
* commit 'e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99':
  Guard against codecinfo overflow

1  2 
media/libstagefright/MetaData.cpp
media/libstagefright/matroska/MatroskaExtractor.cpp

Simple merge