summaryrefslogtreecommitdiffstats
path: root/media/ndk/NdkMediaFormat.cpp
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2014-05-15 21:58:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-15 21:58:36 +0000
commit5362ba070797c52a18d3cb5558cd41d1a72c74c5 (patch)
treefddfcdb07fcc5499c3b026fe4c42b217fef21c7a /media/ndk/NdkMediaFormat.cpp
parent16a25c150c49c730d206167012a24cbd9eb3a082 (diff)
parente419d7cd5c62b4b5866a45d59c5770bb470193c1 (diff)
downloadframeworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.zip
frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.tar.gz
frameworks_av-5362ba070797c52a18d3cb5558cd41d1a72c74c5.tar.bz2
Merge "Unify error/status codes"
Diffstat (limited to 'media/ndk/NdkMediaFormat.cpp')
-rw-r--r--media/ndk/NdkMediaFormat.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/ndk/NdkMediaFormat.cpp b/media/ndk/NdkMediaFormat.cpp
index e1d8c95..77018ec 100644
--- a/media/ndk/NdkMediaFormat.cpp
+++ b/media/ndk/NdkMediaFormat.cpp
@@ -64,10 +64,10 @@ AMediaFormat *AMediaFormat_new() {
}
EXPORT
-int AMediaFormat_delete(AMediaFormat *mData) {
+media_status_t AMediaFormat_delete(AMediaFormat *mData) {
ALOGV("dtor");
delete mData;
- return OK;
+ return AMEDIA_OK;
}