diff options
| author | Andreas Huber <andih@google.com> | 2011-01-26 12:06:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-26 12:06:39 -0800 |
| commit | 6df89fde0db446bb530ab872b373b1faa3ccb06c (patch) | |
| tree | 457bda064ffae68fa2e370f16da94a9db020824f | |
| parent | e0fc4b70f812cef4c8850be91b008e75b28757f3 (diff) | |
| parent | 00d6c725ec465fe2d51252f961b5eaeebf9c9864 (diff) | |
| download | frameworks_base-6df89fde0db446bb530ab872b373b1faa3ccb06c.zip frameworks_base-6df89fde0db446bb530ab872b373b1faa3ccb06c.tar.gz frameworks_base-6df89fde0db446bb530ab872b373b1faa3ccb06c.tar.bz2 | |
Merge "Ignore errors returned from native_window_set_crop." into honeycomb
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 94694a3..802eaa9 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -2203,8 +2203,9 @@ void OMXCodec::onEvent(OMX_EVENTTYPE event, OMX_U32 data1, OMX_U32 data2) { crop.right = right; crop.bottom = bottom; - CHECK_EQ(0, native_window_set_crop( - mNativeWindow.get(), &crop)); + // We'll ignore any errors here, if the surface is + // already invalid, we'll know soon enough. + native_window_set_crop(mNativeWindow.get(), &crop); } } } |