diff options
| author | Marco Nelissen <marcone@google.com> | 2014-05-07 19:55:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-07 19:55:10 +0000 |
| commit | 0dd3c9cb0ed66888c224a97d817701df6c3b2655 (patch) | |
| tree | 488257fb4ade824040ed884bdb7949402ff9af2e /media/ndk/NdkMediaCodec.cpp | |
| parent | a079461668e881718fa6c0de967e557f59da1cab (diff) | |
| parent | 08aaabe87960c04ecac180db1fe88b5a7bc2ed3b (diff) | |
| download | frameworks_av-0dd3c9cb0ed66888c224a97d817701df6c3b2655.zip frameworks_av-0dd3c9cb0ed66888c224a97d817701df6c3b2655.tar.gz frameworks_av-0dd3c9cb0ed66888c224a97d817701df6c3b2655.tar.bz2 | |
Merge "Add NDK version of MediaMuxer"
Diffstat (limited to 'media/ndk/NdkMediaCodec.cpp')
| -rw-r--r-- | media/ndk/NdkMediaCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp index 5412b9b..e7f009e 100644 --- a/media/ndk/NdkMediaCodec.cpp +++ b/media/ndk/NdkMediaCodec.cpp @@ -115,7 +115,7 @@ int AMediaCodec_delete(AMediaCodec *mData) { return OK; } -int AMediaCodec_configure(AMediaCodec *mData, AMediaFormat *format, ANativeWindow* window) { +int AMediaCodec_configure(AMediaCodec *mData, const AMediaFormat* format, ANativeWindow* window) { sp<AMessage> nativeFormat; AMediaFormat_getFormat(format, &nativeFormat); ALOGV("configure with format: %s", nativeFormat->debugString(0).c_str()); |