avformat/mpegtsenc: move is_dvb_subtitle/is_dvb_teletext initialization upwards

[ffmpeg] / libavcodec / aic.c

diff --git a/libavcodec/aic.c b/libavcodec/aic.c
index 956d71fcff995518beb66661fadc2f87b80cded2..c95bdae1edc7e8f147152108dc1a16a149ad634a 100644 (file)
--- a/libavcodec/aic.c
+++ b/libavcodec/aic.c
@@ -22,6 +22,8 @@
 
 #include <inttypes.h>
 
+#include "libavutil/mem_internal.h"
+
 #include "avcodec.h"
 #include "bytestream.h"
 #include "internal.h"
@@ -494,7 +496,7 @@ static av_cold int aic_decode_close(AVCodecContext *avctx)
     return 0;
 }
 
-AVCodec ff_aic_decoder = {
+const AVCodec ff_aic_decoder = {
     .name           = "aic",
     .long_name      = NULL_IF_CONFIG_SMALL("Apple Intermediate Codec"),
     .type           = AVMEDIA_TYPE_VIDEO,
@@ -504,6 +506,5 @@ AVCodec ff_aic_decoder = {
     .close          = aic_decode_close,
     .decode         = aic_decode_frame,
     .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
-    .init_thread_copy = ONLY_IF_THREADS_ENABLED(aic_decode_init),
     .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
 };