am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file"

* commit '65b351c9e6b2de28d9517d90c42965d0fb3c5cd6':
  Fix div zero error in corrupted media file