summaryrefslogtreecommitdiff
path: root/drivers/opus/silk/NLSF_decode.c
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-05-03 22:32:38 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-05-03 22:32:38 -0300
commitdd69aeceac3d1798d0869d8adfb44af883b5fb93 (patch)
tree717e9b909ada0661940f6f3d2bd5349c6424bbf1 /drivers/opus/silk/NLSF_decode.c
parent567cb691ec49844101247bb9dc34bc2722f6af4f (diff)
parentb81d9e6d614a67fd58e2256e90055589205bfa30 (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'drivers/opus/silk/NLSF_decode.c')
-rw-r--r--drivers/opus/silk/NLSF_decode.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/opus/silk/NLSF_decode.c b/drivers/opus/silk/NLSF_decode.c
index 6868a93858..6b922f3eee 100644
--- a/drivers/opus/silk/NLSF_decode.c
+++ b/drivers/opus/silk/NLSF_decode.c
@@ -24,12 +24,9 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.
***********************************************************************/
-
-#ifdef OPUS_ENABLED
#include "opus/opus_config.h"
-#endif
-#include "opus/silk/silk_main.h"
+#include "opus/silk/main.h"
/* Predictive dequantizer for NLSF residuals */
static OPUS_INLINE void silk_NLSF_residual_dequant( /* O Returns RD value in Q30 */