commit 3c16154a3309fe250177d69f3fcd5b6e9a82d1b3
author Andreas Huber <andih@google.com> Thu May 20 11:13:20 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 20 11:13:20 2010 -0700
tree e731510c4a2a0d1f008f13032847f6027cab50ed
parent 3716ea04d9fd59ff95bacdf6efac4ab5583e13fc
parent 2723e09229ce916724861ab90b6b8fc7c9ea9f2e

am 2723e092: Merge "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." into froyo

Merge commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e' into froyo-plus-aosp

* commit '2723e09229ce916724861ab90b6b8fc7c9ea9f2e':
  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.