OSDN Git Service

am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback...
authorLajos Molnar <lajos@google.com>
Fri, 7 Mar 2014 18:31:23 +0000 (18:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 18:31:23 +0000 (18:31 +0000)
commit78e630e12b0da74d5e081cd81bc6ff30334b328a
treeff19377e291c6ca6231b4cc15e26d5b21df9b66a
parent385691a374e0f202ee66c26ed0af94afccd745de
parent909498b72d740e3151561fd4435ad0a329ec9c6e
am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev

* commit '909498b72d740e3151561fd4435ad0a329ec9c6e':
  stagefright: use CODECS field in EXT-X_STREAM-INF as fallback
media/libstagefright/httplive/M3UParser.cpp