diff options
| author | Ed Heyl <ed@google.com> | 2011-10-25 19:50:44 +0000 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2011-10-25 19:50:44 +0000 |
| commit | 9a371a201366ff0c0c132a31029a6c2357400b3e (patch) | |
| tree | 774bc4ce54fa5a335b74703dd1262597c2c0ebc0 | |
| parent | 48188464995a57c381f52f270d818496c8879092 (diff) | |
| parent | ba6d04f523bf6c3c2d4ed6975109e72f328889b8 (diff) | |
| download | android_system_media-9a371a201366ff0c0c132a31029a6c2357400b3e.tar.gz android_system_media-9a371a201366ff0c0c132a31029a6c2357400b3e.tar.bz2 android_system_media-9a371a201366ff0c0c132a31029a6c2357400b3e.zip | |
Merge remote branch 'goog/ics-mr0' into ics-mr1
| -rw-r--r-- | wilhelm/src/android/android_GenericMediaPlayer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/wilhelm/src/android/android_GenericMediaPlayer.cpp b/wilhelm/src/android/android_GenericMediaPlayer.cpp index 8b111fd2..69a7def6 100644 --- a/wilhelm/src/android/android_GenericMediaPlayer.cpp +++ b/wilhelm/src/android/android_GenericMediaPlayer.cpp @@ -196,7 +196,8 @@ void GenericMediaPlayer::preDestroy() { if (player != NULL) { player->stop(); // causes CHECK failure in Nuplayer, but commented out in the subclass preDestroy - player->setDataSource(NULL); + // randomly causes a NPE in StagefrightPlayer, heap corruption, or app hang + //player->setDataSource(NULL); player->setVideoSurface(NULL); player->disconnect(); // release all references to the IMediaPlayer |