virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

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

Browse Source 
Almost all of the code is shared so there is little point in
enabling one decoder/encoder without the other.
This commit is contained in:
Diego Biurrun 2014-02-27 15:02:25 -08:00
parent 34150be515
commit 2f02bbcca0
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -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"

2
libavcodec/Makefile
View File

@ -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

2
libavcodec/huffyuvdec.c
View File

@ -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 = {
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 = {

2
libavcodec/huffyuvenc.c
View File

@ -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 = {
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 = {