Imported Upstream version 6.1

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

diff --git a/libavcodec/vmdaudio.c b/libavcodec/vmdaudio.c
index 2e6e358..7e4477e 100644 (file)
--- a/libavcodec/vmdaudio.c
+++ b/libavcodec/vmdaudio.c
@@ -42,7 +42,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #define BLOCK_TYPE_AUDIO    1
 #define BLOCK_TYPE_INITIAL  2
@@ -230,12 +230,11 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx, AVFrame *frame,
 
 const FFCodec ff_vmdaudio_decoder = {
     .p.name         = "vmdaudio",
-    .p.long_name    = NULL_IF_CONFIG_SMALL("Sierra VMD audio"),
+    CODEC_LONG_NAME("Sierra VMD audio"),
     .p.type         = AVMEDIA_TYPE_AUDIO,
     .p.id           = AV_CODEC_ID_VMDAUDIO,
     .priv_data_size = sizeof(VmdAudioContext),
     .init           = vmdaudio_decode_init,
     FF_CODEC_DECODE_CB(vmdaudio_decode_frame),
     .p.capabilities = AV_CODEC_CAP_DR1,
-    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };