am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"

* commit '90892d1be84776f59a619ea4ef9ce51be5828ff8':
  Fix SIGABRT when playing mp4 file