Almost all of the code is shared so there is little point in
enabling one decoder/encoder without the other.
---
configure | 4 ++--
libavcodec/Makefile | 2 --
libavcodec/huffyuvdec.c | 2 --
libavcodec/huffyuvenc.c | 2 --
4 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index b792150..411019c 100755
--- a/configure
+++ b/configure
@@ -1670,8 +1670,8 @@ eatgq_decoder_select="aandcttables dsputil"
eatqi_decoder_select="aandcttables error_resilience mpegvideo"
ffv1_decoder_select="dsputil golomb rangecoder"
ffv1_encoder_select="dsputil rangecoder"
-ffvhuff_decoder_select="dsputil"
-ffvhuff_encoder_select="dsputil huffman"
+ffvhuff_decoder_select="huffyuv_decoder"
+ffvhuff_encoder_select="huffyuv_encoder"
fic_decoder_select="dsputil golomb"
flac_decoder_select="golomb"
flac_encoder_select="dsputil golomb lpc"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 8515272..4adfaf9 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -168,8 +168,6 @@ OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o
OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o
OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o
OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.o ffv1.o
-OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o huffyuvdec.o
-OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o huffyuvenc.o
OBJS-$(CONFIG_FIC_DECODER) += fic.o
OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o flacdsp.o
OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o flacdsp.o
diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index ed490d4..86d1581 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -737,7 +737,6 @@ static av_cold int decode_end(AVCodecContext *avctx)
return 0;
}
-#if CONFIG_HUFFYUV_DECODER
AVCodec ff_huffyuv_decoder = {
.name = "huffyuv",
.long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
@@ -751,7 +750,6 @@ AVCodec ff_huffyuv_decoder = {
CODEC_CAP_FRAME_THREADS,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
};
-#endif
#if CONFIG_FFVHUFF_DECODER
AVCodec ff_ffvhuff_decoder = {
diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c
index ec07abd..1442b75 100644
--- a/libavcodec/huffyuvenc.c
+++ b/libavcodec/huffyuvenc.c
@@ -682,7 +682,6 @@ static av_cold int encode_end(AVCodecContext *avctx)
return 0;
}
-#if CONFIG_HUFFYUV_ENCODER
AVCodec ff_huffyuv_encoder = {
.name = "huffyuv",
.long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
@@ -697,7 +696,6 @@ AVCodec ff_huffyuv_encoder = {
AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
},
};
-#endif
#if CONFIG_FFVHUFF_ENCODER
AVCodec ff_ffvhuff_encoder = {
--
1.8.3.2
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
