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 /include/ndk/NdkMediaCodec.h | |
| 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 'include/ndk/NdkMediaCodec.h')
| -rw-r--r-- | include/ndk/NdkMediaCodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h index 5067073..73ece1b 100644 --- a/include/ndk/NdkMediaCodec.h +++ b/include/ndk/NdkMediaCodec.h @@ -79,7 +79,7 @@ int AMediaCodec_delete(AMediaCodec*); /** * Configure the codec. For decoding you would typically get the format from an extractor. */ -int AMediaCodec_configure(AMediaCodec*, AMediaFormat *format, ANativeWindow* surface); // TODO: other args +int AMediaCodec_configure(AMediaCodec*, const AMediaFormat* format, ANativeWindow* surface); // TODO: other args /** * Start the codec. A codec must be configured before it can be started, and must be started |