am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '70cc5bdc0fca3f67f3602f04152c29323cad99df':
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.