summaryrefslogtreecommitdiffstats
path: root/media/ndk/NdkMediaCrypto.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-05-15 14:17:25 -0700
committerMarco Nelissen <marcone@google.com>2014-05-15 14:41:20 -0700
commite419d7cd5c62b4b5866a45d59c5770bb470193c1 (patch)
treeeaabdbe6d72e7be1ceb0b1907784083db848c674 /media/ndk/NdkMediaCrypto.cpp
parent3425fd5a55dd31e261d2f2a9590c762d6d0a6b79 (diff)
downloadframeworks_av-e419d7cd5c62b4b5866a45d59c5770bb470193c1.zip
frameworks_av-e419d7cd5c62b4b5866a45d59c5770bb470193c1.tar.gz
frameworks_av-e419d7cd5c62b4b5866a45d59c5770bb470193c1.tar.bz2
Unify error/status codes
Change-Id: Ib90cc2f2adc07ff146256931c92c0ec4becb86f5
Diffstat (limited to 'media/ndk/NdkMediaCrypto.cpp')
-rw-r--r--media/ndk/NdkMediaCrypto.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/ndk/NdkMediaCrypto.cpp b/media/ndk/NdkMediaCrypto.cpp
index c686273..cbadea5 100644
--- a/media/ndk/NdkMediaCrypto.cpp
+++ b/media/ndk/NdkMediaCrypto.cpp
@@ -35,12 +35,12 @@
using namespace android;
-static int translate_error(status_t err) {
+static media_status_t translate_error(status_t err) {
if (err == OK) {
- return OK;
+ return AMEDIA_OK;
}
ALOGE("sf error code: %d", err);
- return -1000;
+ return AMEDIA_ERROR_UNKNOWN;
}