summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx/OMX.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-02-06 23:46:37 -0800
committerJames Dong <jdong@google.com>2012-02-10 11:43:09 -0800
commitf1d5aa162c02a16b7195a43a9bcea4d592600ac4 (patch)
treedc270a6e1a4ee6695e309eeb29c4d9ed7f3a20a2 /media/libstagefright/omx/OMX.cpp
parent43089daaf82bd2b8e5f9a29b80af5abaae4657b3 (diff)
downloadframeworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.zip
frameworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.tar.gz
frameworks_av-f1d5aa162c02a16b7195a43a9bcea4d592600ac4.tar.bz2
Move away from MediaDebug and use ADebug instead
Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
Diffstat (limited to 'media/libstagefright/omx/OMX.cpp')
-rw-r--r--media/libstagefright/omx/OMX.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp
index ace883c..f11fcd2 100644
--- a/media/libstagefright/omx/OMX.cpp
+++ b/media/libstagefright/omx/OMX.cpp
@@ -25,7 +25,7 @@
#include "../include/OMXNodeInstance.h"
#include <binder/IMemory.h>
-#include <media/stagefright/MediaDebug.h>
+#include <media/stagefright/foundation/ADebug.h>
#include <utils/threads.h>
#include "OMXMaster.h"
@@ -102,7 +102,7 @@ OMX::CallbackDispatcher::~CallbackDispatcher() {
if (status != WOULD_BLOCK) {
// Other than join to self, the only other error return codes are
// whatever readyToRun() returns, and we don't override that
- CHECK_EQ(status, NO_ERROR);
+ CHECK_EQ(status, (status_t)NO_ERROR);
}
}