Imported Upstream version 6.1

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

diff --git a/libavcodec/samidec.c b/libavcodec/samidec.c
index cf5dec9..e84c4bc 100644 (file)
--- a/libavcodec/samidec.c
+++ b/libavcodec/samidec.c
@@ -182,7 +182,7 @@ static void sami_flush(AVCodecContext *avctx)
 
 const FFCodec ff_sami_decoder = {
     .p.name         = "sami",
-    .p.long_name    = NULL_IF_CONFIG_SMALL("SAMI subtitle"),
+    CODEC_LONG_NAME("SAMI subtitle"),
     .p.type         = AVMEDIA_TYPE_SUBTITLE,
     .p.id           = AV_CODEC_ID_SAMI,
     .priv_data_size = sizeof(SAMIContext),
@@ -190,5 +190,4 @@ const FFCodec ff_sami_decoder = {
     .close          = sami_close,
     FF_CODEC_DECODE_SUB_CB(sami_decode_frame),
     .flush          = sami_flush,
-    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };