commit e89f5d9ef38caec9240a74a9da7974ac5253f623
author Andreas Huber <andih@google.com> Wed Jan 26 12:12:28 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 26 12:12:28 2011 -0800
tree d930204fae542b4bac125f3c9361e0f2571e6da2
parent 87175263c86341c56e4971d3180777800026db66
parent d0fc955c08ed14ba8e4f0967b4fcef3c10bdcc62

am 1a6e6d55: am 6df89fde: Merge "Ignore errors returned from native_window_set_crop." into honeycomb

* commit '1a6e6d55b8dd33b3bd2b52849d39ef96b556b52f':
  Ignore errors returned from native_window_set_crop.

media/libstagefright/OMXCodec.cpp

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 @@
                         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);
                     }
                 }
             }