| commit | 5bb42b780a934386f26c1c1f0a8249494ec65f7c | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 06 14:25:26 2009 -0500 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 06 14:25:26 2009 -0500 |
| tree | 6f8069290744fb50ea485a80ecda5bf449d15a6d | |
| parent | 84ec55b736ae2278d6abdc1c7a0312de46ef5f3d [diff] | |
| parent | fa70cad40b01627ac1c22e04cdd548ece9c2654f [diff] |
Merge change I9a50fdf4 into eclair-mr2 * changes: Handle OMX_StateInvalid in emergency shutdown properly (by ignoring it and hoping for the best) instead of asserting.
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index ab8be53..8218918 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp
@@ -149,6 +149,7 @@ } case OMX_StateLoaded: + case OMX_StateInvalid: break; default: