am 380d1e1a: am 2e25819f: Merge "M3UParser: check for NULL before setting meta data"

* commit '380d1e1abff2bbcba45d452e37f9699792422c08':
  M3UParser: check for NULL before setting meta data