1 files changed, 1 insertions, 4 deletions
diff --git a/media/tools/omx_test/omx_test.cc b/media/tools/omx_test/omx_test.cc
index 2deddeb..2b39fee 100644
--- a/media/tools/omx_test/omx_test.cc
+++ b/media/tools/omx_test/omx_test.cc
@@ -112,7 +112,7 @@ class TestApp : public base::RefCountedThreadSafe<TestApp> {
     // There are some conditions we don't want to enqueue, for example when
     // the last buffer is an end-of-stream buffer, when we have stopped, and
     // when we have received an error.
-    bool eos = buffer->IsEndOfStream();
+    bool eos = buffer.get() && buffer->IsEndOfStream();
     if (!eos && !stopped_ && !error_)
       FeedInputBuffer();
   }
@@ -164,9 +164,6 @@ class TestApp : public base::RefCountedThreadSafe<TestApp> {
                         NewRunnableMethod(this,
                                           &TestApp::InitializeDoneCallback));
 
-    for (int i = 0; i < 20; ++i)
-      FeedInputBuffer();
-
     // Execute the message loop so that we can run tasks on it. This call
     // will return when we call message_loop_.Quit().
     message_loop_.Run();