diff options
| author | Andreas Huber <andih@google.com> | 2011-01-26 12:09:56 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-26 12:09:56 -0800 |
| commit | d0fc955c08ed14ba8e4f0967b4fcef3c10bdcc62 (patch) | |
| tree | 4a5d1146a7208ce4633128c3639e9f932d0346df /media | |
| parent | 86ba757ddf906a7b59f0dbba9a2197d823650050 (diff) | |
| parent | fccf727542ac3efa1d75234260db73edb53c76a1 (diff) | |
| download | frameworks_av-d0fc955c08ed14ba8e4f0967b4fcef3c10bdcc62.zip frameworks_av-d0fc955c08ed14ba8e4f0967b4fcef3c10bdcc62.tar.gz frameworks_av-d0fc955c08ed14ba8e4f0967b4fcef3c10bdcc62.tar.bz2 | |
am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb
* commit '6df89fde0db446bb530ab872b373b1faa3ccb06c':
Ignore errors returned from native_window_set_crop.
Diffstat (limited to 'media')
| -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); } } } |