commit 9c6c7f370f9b3801caa1e45ac75e0c13619bf10c
author Craig Donner <cdonner@google.com> Sat Sep 24 09:58:41 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 24 09:58:41 2016 +0000
tree 92201f3c37d28f2d5cd9db07d29b9586341e2654
parent 824d20c999f37a8c774322dbb7e76dbdf7f7a718
parent a092e5581926703ecfe296e64d3a8fe7d7c65984

Merge "Revert "Handle lock() returning a NULL buffer in SurfaceUtils."" into nyc-mr1-dev

media/libstagefright/SurfaceUtils.cpp

diff --git a/media/libstagefright/SurfaceUtils.cpp b/media/libstagefright/SurfaceUtils.cpp
index 60ef662..568837a 100644
--- a/media/libstagefright/SurfaceUtils.cpp
+++ b/media/libstagefright/SurfaceUtils.cpp
@@ -186,10 +186,6 @@
             break;
         }
 
-        if (img == NULL) {
-            ALOGE("error pushing blank frames: lock returned NULL buffer");
-            break;
-        }
         *img = 0;
 
         err = buf->unlock();