OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7d5712 22f6934)
am 3c16154a: am 2723e092: Merge "Better handling of codec initialization failure...
authorAndreas Huber <andih@google.com>
Thu, 20 May 2010 18:14:37 +0000 (11:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 May 2010 18:14:37 +0000 (11:14 -0700)
Merge commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3' into kraken

* commit '3c16154a3309fe250177d69f3fcd5b6e9a82d1b3':
  Better handling of codec initialization failure in the player and thumbnail extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize.


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help