am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short) chunks in mpeg4 files." into gingerbread

Merge commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493'

* commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493':
  Properly identify malformed (too short) chunks in mpeg4 files.