diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-27 15:02:25 -0800 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-02-28 21:17:01 +0100 |
| commit | 2f02bbcca050936686482453078e83dc25493da0 (patch) | |
| tree | f14a4fa553b8c29dea62416fadc903bfbca1cc90 | |
| parent | 34150be515cd9c43b0b679806b8d01774960af78 (diff) | |
| download | ffmpeg-2f02bbcca050936686482453078e83dc25493da0.tar.gz | |
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.
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/huffyuvdec.c | 2 | ||||
| -rw-r--r-- | libavcodec/huffyuvenc.c | 2 |
4 files changed, 2 insertions, 8 deletions
@@ -1669,8 +1669,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 1bd4acea17..44d5ae66ab 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 ed490d4bd7..86d15819b4 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 ec07abdcc1..1442b753de 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 = { |