Imported Upstream version 6.1

[platform/upstream/ffmpeg.git] / libavcodec / libopusdec.c

diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c
index 316ab0f..9b9a610 100644 (file)
--- a/libavcodec/libopusdec.c
+++ b/libavcodec/libopusdec.c
@@ -29,10 +29,11 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
-#include "vorbis.h"
 #include "mathops.h"
 #include "libopus.h"
+#include "vorbis_data.h"
 
 struct libopus_context {
     AVClass *class;
@@ -232,7 +233,7 @@ static const AVClass libopusdec_class = {
 
 const FFCodec ff_libopus_decoder = {
     .p.name         = "libopus",
-    .p.long_name    = NULL_IF_CONFIG_SMALL("libopus Opus"),
+    CODEC_LONG_NAME("libopus Opus"),
     .p.type         = AVMEDIA_TYPE_AUDIO,
     .p.id           = AV_CODEC_ID_OPUS,
     .priv_data_size = sizeof(struct libopus_context),
@@ -241,7 +242,8 @@ const FFCodec ff_libopus_decoder = {
     FF_CODEC_DECODE_CB(libopus_decode),
     .flush          = libopus_flush,
     .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF,
-    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
+    .caps_internal  = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
+                      FF_CODEC_CAP_INIT_CLEANUP,
     .p.sample_fmts  = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT,
                                                      AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },