diff options
author | Ben Murdoch <benm@google.com> | 2014-03-31 11:52:09 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2014-03-31 11:52:09 +0100 |
commit | e383b38591b010ab08ebddf1fd8d821796bd961a (patch) | |
tree | 93db20ddff9e7822901fbef37f2a352e48426a3f /include/opus_custom.h | |
parent | 2e9d78360501420fdfa0a69b879770aeb081de2c (diff) | |
parent | 29a0dda797b58108d148e7f25371f892f84205d4 (diff) | |
download | src-e383b38591b010ab08ebddf1fd8d821796bd961a.tar.gz |
Merge from Chromium at DEPS revision 260458android-wear-5.0.0_r1android-l-preview_r2android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-release
This commit was generated by merge_to_master.py.
Change-Id: If6dcb6e8c436754661eaea9437ad414643b73992
Diffstat (limited to 'include/opus_custom.h')
-rw-r--r-- | include/opus_custom.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/opus_custom.h b/include/opus_custom.h index 6cf3963..41f36bf 100644 --- a/include/opus_custom.h +++ b/include/opus_custom.h @@ -47,7 +47,7 @@ extern "C" { #else # define OPUS_CUSTOM_EXPORT # ifdef OPUS_BUILD -# define OPUS_CUSTOM_EXPORT_STATIC static inline +# define OPUS_CUSTOM_EXPORT_STATIC static OPUS_INLINE # else # define OPUS_CUSTOM_EXPORT_STATIC # endif @@ -140,6 +140,7 @@ OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_si int channels ) OPUS_ARG_NONNULL(1); +# ifdef CUSTOM_MODES /** Initializes a previously allocated encoder state * The memory pointed to by st must be the size returned by opus_custom_encoder_get_size. * This is intended for applications which use their own allocator instead of malloc. @@ -152,12 +153,12 @@ OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_si * @param [in] channels <tt>int</tt>: Number of channels * @return OPUS_OK Success or @ref opus_errorcodes */ -OPUS_CUSTOM_EXPORT_STATIC int opus_custom_encoder_init( +OPUS_CUSTOM_EXPORT int opus_custom_encoder_init( OpusCustomEncoder *st, const OpusCustomMode *mode, int channels ) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2); - +# endif #endif |