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 02:38:22 +0000 (02:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 02:38:22 +0000 (02:38 +0000)
commitd7c4da3c1c33b5219d7d87ba698cd7d9c8750c41
tree7e9d5420e764d85b5ac10685985a19ef3c460e60
parent4dbd814de3a3bc95ca3fe39be2400418e7a05602
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