commit 1f6ea1df082767b51a311630f5b72e2e264c1e3b
author Andreas Huber <andih@google.com> Tue Sep 21 15:20:38 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 21 15:20:38 2010 -0700
tree 450bd5a7a08f9f1b10c40791236426d32f2f2d77
parent 4d6205a5ceb3e53cdcbf4f473e7bb1509503c1c5
parent a3121424e0680647e8ab7beb4229db6d8d4f337f

am 87d208f7: Merge "This log message is codec specific." into gingerbread

Merge commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13' into gingerbread-plus-aosp

* commit '87d208f7ea7d8fc518d1403aae6d1ba1833bff13':
  This log message is codec specific.

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 523b79c..33081a9 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -1798,7 +1798,7 @@
 
         case OMX_EventError:
         {
-            LOGE("ERROR(0x%08lx, %ld)", data1, data2);
+            CODEC_LOGE("ERROR(0x%08lx, %ld)", data1, data2);
 
             setState(ERROR);
             break;