Updating Opus to release 1.1

include/opus_custom.h

 /* Copyright (c) 2007-2008 CSIRO
    Copyright (c) 2007-2009 Xiph.Org Foundation
    Copyright (c) 2008-2012 Gregory Maxwell
    Written by Jean-Marc Valin and Gregory Maxwell */
 /*
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
 
    - Redistributions of source code must retain the above copyright
@@ skipping 29 matching lines @@
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifdef CUSTOM_MODES
 # define OPUS_CUSTOM_EXPORT OPUS_EXPORT
 # define OPUS_CUSTOM_EXPORT_STATIC OPUS_EXPORT
 #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
 #endif
 
 /** @defgroup opus_custom Opus Custom
   * @{
   *  Opus Custom is an optional part of the Opus specification and
   * reference implementation which uses a distinct API from the regular
   * API and supports frame sizes that are not normally supported.\ Use
@@ skipping 72 matching lines @@
 /** Gets the size of an OpusCustomEncoder structure.
   * @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
   * @param [in] channels <tt>int</tt>: Number of channels
   * @returns size
   */
 OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_size(
     const OpusCustomMode *mode,
     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.
   * @see opus_custom_encoder_create(),opus_custom_encoder_get_size()
   * To reset a previously initialized state use the OPUS_RESET_STATE CTL.
   * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
   * @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
   *  the stream (must be the same characteristics as used for the
   *  decoder)
   * @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
 
 
 /** Creates a new encoder state. Each stream needs its own encoder
   * state (can't be shared across simultaneous streams).
   * @param [in] mode <tt>OpusCustomMode*</tt>: Contains all the information about the characteristics of
   *  the stream (must be the same characteristics as used for the
   *  decoder)
   * @param [in] channels <tt>int</tt>: Number of channels
   * @param [out] error <tt>int*</tt>: Returns an error code
@@ skipping 161 matching lines @@
   */
 OPUS_CUSTOM_EXPORT int opus_custom_decoder_ctl(OpusCustomDecoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
 
 /**@}*/
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif /* OPUS_CUSTOM_H */