am e6ca5b2d: am 566c70ca: Guard against codecinfo overflow

* commit 'e6ca5b2d97f61e96af35fabed8c2ba352b8b5b99':
  Guard against codecinfo overflow