From db2cd9cabf64086d2914e1d68d1883c8e786b1d3 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sun, 5 May 2024 07:57:24 +0200 Subject: [PATCH] avcodec/Makefile, v408(dec|enc): Remove remnants of AYUV codecs Forgotten in 9ee59b63f5ea37700916815538c32dbcadc4a512. Signed-off-by: Andreas Rheinhardt --- libavcodec/Makefile | 2 -- libavcodec/v408dec.c | 4 ---- libavcodec/v408enc.c | 5 ----- 3 files changed, 11 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index cff6347bdb..cfd8e06eba 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -268,8 +268,6 @@ OBJS-$(CONFIG_AVRP_ENCODER) += r210enc.o OBJS-$(CONFIG_AVS_DECODER) += avs.o OBJS-$(CONFIG_AVUI_DECODER) += avuidec.o OBJS-$(CONFIG_AVUI_ENCODER) += avuienc.o -OBJS-$(CONFIG_AYUV_DECODER) += v408dec.o -OBJS-$(CONFIG_AYUV_ENCODER) += v408enc.o OBJS-$(CONFIG_BETHSOFTVID_DECODER) += bethsoftvideo.o OBJS-$(CONFIG_BFI_DECODER) += bfi.o OBJS-$(CONFIG_BINK_DECODER) += bink.o binkdsp.o diff --git a/libavcodec/v408dec.c b/libavcodec/v408dec.c index 4d8bccd650..bb6c877c79 100644 --- a/libavcodec/v408dec.c +++ b/libavcodec/v408dec.c @@ -19,8 +19,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - #include "avcodec.h" #include "codec_internal.h" #include "decode.h" @@ -74,7 +72,6 @@ static int v408_decode_frame(AVCodecContext *avctx, AVFrame *pic, return avpkt->size; } -#if CONFIG_V408_DECODER const FFCodec ff_v408_decoder = { .p.name = "v408", CODEC_LONG_NAME("Uncompressed packed QT 4:4:4:4"), @@ -84,4 +81,3 @@ const FFCodec ff_v408_decoder = { FF_CODEC_DECODE_CB(v408_decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, }; -#endif diff --git a/libavcodec/v408enc.c b/libavcodec/v408enc.c index c1bf0f6158..c173f650ef 100644 --- a/libavcodec/v408enc.c +++ b/libavcodec/v408enc.c @@ -20,9 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_components.h" - -#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "codec_internal.h" #include "encode.h" @@ -72,7 +69,6 @@ static int v408_encode_frame(AVCodecContext *avctx, AVPacket *pkt, static const enum AVPixelFormat pix_fmt[] = { AV_PIX_FMT_YUVA444P, AV_PIX_FMT_NONE }; -#if CONFIG_V408_ENCODER const FFCodec ff_v408_encoder = { .p.name = "v408", CODEC_LONG_NAME("Uncompressed packed QT 4:4:4:4"), @@ -83,4 +79,3 @@ const FFCodec ff_v408_encoder = { FF_CODEC_ENCODE_CB(v408_encode_frame), .p.pix_fmts = pix_fmt, }; -#endif