commit df6b61291f6f89d827851d5ed727b09d19a5c7db
author Android (Google) Code Review <android-gerrit@google.com> Thu Oct 29 16:20:43 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 29 16:20:43 2009 -0400
tree 9f8de91747d54f044006813e651b73c98a82fd92
parent b439827ca7e2a991055260982952b8fd8bc84fee
parent 888f72a4628eed3c136ff2e346a15d129da0d520

Merge change Ib482ce88 into eclair-mr2

* changes:
  Revive support for video encoding in OMXCodec.

media/libmediaplayerservice/TestPlayerStub.cpp

diff --git a/media/libmediaplayerservice/TestPlayerStub.cpp b/media/libmediaplayerservice/TestPlayerStub.cpp
index 8627708..aa49429 100644
--- a/media/libmediaplayerservice/TestPlayerStub.cpp
+++ b/media/libmediaplayerservice/TestPlayerStub.cpp
@@ -176,7 +176,7 @@
     mContentUrl = NULL;
 
     if (mPlayer) {
-        LOG_ASSERT(mDeletePlayer != NULL);
+        LOG_ASSERT(mDeletePlayer != NULL, "mDeletePlayer is null");
         (*mDeletePlayer)(mPlayer);
         mPlayer = NULL;
     }