Merge commit '1f7b4f9abc6bae94e576e710b8d10117ca3c8238'

[ffmpeg] / libavcodec / opusdec.c

diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index ec793c6c471d94854910b2e0ddeeb73eae7d4e5b..556acfe2df9f88b662278e19031139eb9b6fc6c0 100644 (file)
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -47,6 +47,7 @@
 #include "internal.h"
 #include "mathops.h"
 #include "opus.h"
+#include "opustab.h"
 
 static const uint16_t silk_frame_duration_ms[16] = {
     10, 20, 40, 60,
@@ -646,7 +647,6 @@ static av_cold int opus_decode_init(AVCodecContext *avctx)
     /* find out the channel configuration */
     ret = ff_opus_parse_extradata(avctx, c);
     if (ret < 0) {
-        av_freep(&c->channel_maps);
         av_freep(&c->fdsp);
         return ret;
     }