diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-13 19:16:06 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-16 11:05:39 +0200 |
| commit | f704a079a122a7a92db4d88c9aea5e3a88e38bc9 (patch) | |
| tree | 4d6735b527aede2435895b7f548d7cc2d0d06610 | |
| parent | c292f6a24d13cb6b099f295f67c37e98d2fa1685 (diff) | |
| download | ffmpeg-f704a079a122a7a92db4d88c9aea5e3a88e38bc9.tar.gz | |
build: Factor out rangecoder dependencies to CONFIG_RANGECODER
A new hidden config variable is added for the codecs that depend on
the rangecoder parts.
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | libavcodec/Makefile | 9 |
2 files changed, 10 insertions, 7 deletions
@@ -1229,6 +1229,7 @@ CONFIG_EXTRA=" mpegvideo mpegvideoenc nettle + rangecoder rtpdec sinewin vp3dsp @@ -1363,7 +1364,8 @@ eac3_encoder_select="mdct ac3dsp" eamad_decoder_select="aandcttables error_resilience" eatgq_decoder_select="aandcttables" eatqi_decoder_select="aandcttables error_resilience mpegvideo" -ffv1_decoder_select="golomb" +ffv1_decoder_select="golomb rangecoder" +ffv1_encoder_select="rangecoder" flac_decoder_select="golomb" flac_encoder_select="golomb lpc" flashsv_decoder_select="zlib" @@ -1443,8 +1445,8 @@ rv30_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvi rv40_decoder_select="error_resilience golomb h264chroma h264pred h264qpel mpegvideo" shorten_decoder_select="golomb" sipr_decoder_select="lsp" -snow_decoder_select="dwt" -snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc" +snow_decoder_select="dwt rangecoder" +snow_encoder_select="aandcttables dwt error_resilience mpegvideoenc rangecoder" svq1_decoder_select="error_resilience mpegvideo" svq1_encoder_select="aandcttables error_resilience mpegvideoenc" svq3_decoder_select="error_resilience golomb h264chroma h264dsp h264pred h264qpel mpegvideo" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5393c51b76..aaafa033d7 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -55,6 +55,7 @@ OBJS-$(CONFIG_MPEGAUDIODSP) += mpegaudiodsp.o \ OBJS-$(CONFIG_MPEGVIDEO) += mpegvideo.o mpegvideo_motion.o OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ motion_est.o ratecontrol.o +OBJS-$(CONFIG_RANGECODER) += rangecoder.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) OBJS-$(CONFIG_SINEWIN) += sinewin.o @@ -156,8 +157,8 @@ OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o OBJS-$(CONFIG_ESCAPE124_DECODER) += escape124.o -OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o rangecoder.o -OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o rangecoder.o +OBJS-$(CONFIG_FFV1_DECODER) += ffv1.o +OBJS-$(CONFIG_FFV1_ENCODER) += ffv1.o OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o OBJS-$(CONFIG_FLAC_DECODER) += flacdec.o flacdata.o flac.o flacdsp.o @@ -343,8 +344,8 @@ OBJS-$(CONFIG_SIPR_DECODER) += sipr.o acelp_pitch_delay.o \ OBJS-$(CONFIG_SMACKAUD_DECODER) += smacker.o OBJS-$(CONFIG_SMACKER_DECODER) += smacker.o OBJS-$(CONFIG_SMC_DECODER) += smc.o -OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o rangecoder.o -OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o rangecoder.o \ +OBJS-$(CONFIG_SNOW_DECODER) += snowdec.o snow.o +OBJS-$(CONFIG_SNOW_ENCODER) += snowenc.o snow.o \ h263.o ituh263enc.o OBJS-$(CONFIG_SOL_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_SP5X_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o |