diff options
| author | Marco Nelissen <marcone@google.com> | 2014-05-15 21:58:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 21:58:36 +0000 |
| commit | 5362ba070797c52a18d3cb5558cd41d1a72c74c5 (patch) | |
| tree | fddfcdb07fcc5499c3b026fe4c42b217fef21c7a /media/ndk/NdkMediaCrypto.cpp | |
| parent | 16a25c150c49c730d206167012a24cbd9eb3a082 (diff) | |
| parent | e419d7cd5c62b4b5866a45d59c5770bb470193c1 (diff) | |
| download | frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.zip frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.tar.gz frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.tar.bz2 | |
Merge "Unify error/status codes"
Diffstat (limited to 'media/ndk/NdkMediaCrypto.cpp')
| -rw-r--r-- | media/ndk/NdkMediaCrypto.cpp | 6 |
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; } |