am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev

* commit '5bc83fc352e5682ecafe61d77062c26ac8db4229':
  Fix SIGABRT when playing mp4 file