Commit 2f02bbcc authored by Diego Biurrun's avatar Diego Biurrun
Browse files

build: Let the ffvhuff decoder/encoder depend on the huffyuv decoder/encoder

Almost all of the code is shared so there is little point in
enabling one decoder/encoder without the other.
parent 34150be5
...@@ -1669,8 +1669,8 @@ eatgq_decoder_select="aandcttables dsputil" ...@@ -1669,8 +1669,8 @@ eatgq_decoder_select="aandcttables dsputil"
eatqi_decoder_select="aandcttables error_resilience mpegvideo" eatqi_decoder_select="aandcttables error_resilience mpegvideo"
ffv1_decoder_select="dsputil golomb rangecoder" ffv1_decoder_select="dsputil golomb rangecoder"
ffv1_encoder_select="dsputil rangecoder" ffv1_encoder_select="dsputil rangecoder"
ffvhuff_decoder_select="dsputil" ffvhuff_decoder_select="huffyuv_decoder"
ffvhuff_encoder_select="dsputil huffman" ffvhuff_encoder_select="huffyuv_encoder"
fic_decoder_select="dsputil golomb" fic_decoder_select="dsputil golomb"
flac_decoder_select="golomb" flac_decoder_select="golomb"
flac_encoder_select="dsputil golomb lpc" flac_encoder_select="dsputil golomb lpc"
......
...@@ -168,8 +168,6 @@ OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o ...@@ -168,8 +168,6 @@ OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o
OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o OBJS-$(CONFIG_ESCAPE130_DECODER) += escape130.o
OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o OBJS-$(CONFIG_FFV1_DECODER) += ffv1dec.o ffv1.o
OBJS-$(CONFIG_FFV1_ENCODER) += ffv1enc.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_FIC_DECODER) += fic.o
OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o flacdsp.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 OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o flacdata.o flac.o flacdsp.o
......
...@@ -737,7 +737,6 @@ static av_cold int decode_end(AVCodecContext *avctx) ...@@ -737,7 +737,6 @@ static av_cold int decode_end(AVCodecContext *avctx)
return 0; return 0;
} }
#if CONFIG_HUFFYUV_DECODER
AVCodec ff_huffyuv_decoder = { AVCodec ff_huffyuv_decoder = {
.name = "huffyuv", .name = "huffyuv",
.long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
...@@ -751,7 +750,6 @@ AVCodec ff_huffyuv_decoder = { ...@@ -751,7 +750,6 @@ AVCodec ff_huffyuv_decoder = {
CODEC_CAP_FRAME_THREADS, CODEC_CAP_FRAME_THREADS,
.init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy),
}; };
#endif
#if CONFIG_FFVHUFF_DECODER #if CONFIG_FFVHUFF_DECODER
AVCodec ff_ffvhuff_decoder = { AVCodec ff_ffvhuff_decoder = {
......
...@@ -682,7 +682,6 @@ static av_cold int encode_end(AVCodecContext *avctx) ...@@ -682,7 +682,6 @@ static av_cold int encode_end(AVCodecContext *avctx)
return 0; return 0;
} }
#if CONFIG_HUFFYUV_ENCODER
AVCodec ff_huffyuv_encoder = { AVCodec ff_huffyuv_encoder = {
.name = "huffyuv", .name = "huffyuv",
.long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"),
...@@ -697,7 +696,6 @@ AVCodec ff_huffyuv_encoder = { ...@@ -697,7 +696,6 @@ AVCodec ff_huffyuv_encoder = {
AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE AV_PIX_FMT_RGB32, AV_PIX_FMT_NONE
}, },
}; };
#endif
#if CONFIG_FFVHUFF_ENCODER #if CONFIG_FFVHUFF_ENCODER
AVCodec ff_ffvhuff_encoder = { AVCodec ff_ffvhuff_encoder = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment