diff options
author | Andreas Huber <andih@google.com> | 2010-05-20 11:13:20 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-20 11:13:20 -0700 |
commit | 8fe7fa8f90e52cab210ec1de861f2d8ac9435968 (patch) | |
tree | f15953bd8e8aa9d8b58f7c8e47c0e736c6948b98 /media/libstagefright/StagefrightMediaScanner.cpp | |
parent | c0b42f27a36c96b0ce16ade57c26ff1decb4bb72 (diff) | |
parent | 139a5d5bd33c9fc7708d0a79f11ee928f7796e6b (diff) | |
download | frameworks_av-8fe7fa8f90e52cab210ec1de861f2d8ac9435968.zip frameworks_av-8fe7fa8f90e52cab210ec1de861f2d8ac9435968.tar.gz frameworks_av-8fe7fa8f90e52cab210ec1de861f2d8ac9435968.tar.bz2 |
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.
Diffstat (limited to 'media/libstagefright/StagefrightMediaScanner.cpp')
0 files changed, 0 insertions, 0 deletions