OSDN Git Service

am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev
authorLajos Molnar <lajos@google.com>
Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 05:14:33 +0000 (05:14 +0000)
commitfa243e07f062058e7df01c052eb79086c21fbdbc
tree6aa6de55a5e0e271dd3a7240245ffe0d8393f6ce
parenta0b94395dc82c90ca437bb6fed7aa01fcbbffffe
parent466786b25b262f4f6e5737b3a88e8d7f6916e45c
am 466786b2: am 70cc5bdc: Merge changes Ic46e3069,Idc92716b into klp-dev

* commit '466786b25b262f4f6e5737b3a88e8d7f6916e45c':
  LiveSession: fix incorrect stream key (subtitle"s")
  M3UParser: trim spaces when parsing comma separated codecs.
media/libstagefright/httplive/LiveSession.cpp
media/libstagefright/httplive/M3UParser.cpp