diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-02-27 15:02:22 -0800 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-02-28 20:44:53 +0100 |
| commit | 0a36988e48dd581d29e77f768f987738bdf365f0 (patch) | |
| tree | 33b10f0f810d12b652233cd9bda18aef7698447b | |
| parent | f4bd9fe326ad1315a74206939ae56df93b940a09 (diff) | |
| download | ffmpeg-0a36988e48dd581d29e77f768f987738bdf365f0.tar.gz | |
build: Let AMV decoder depend on the SP5X decoder
This codec compiles all of the SP5X code anyway, so there is little
point in not enabling the decoder directly. This also simplifies the
dependency declaration for the AMV decoder.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -1638,7 +1638,7 @@ alac_encoder_select="lpc" als_decoder_select="dsputil" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" -amv_decoder_select="dsputil hpeldsp" +amv_decoder_select="sp5x_decoder" ape_decoder_select="dsputil" asv1_decoder_select="dsputil" asv1_encoder_select="dsputil" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fcb36eecdc..d67df06a57 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -96,7 +96,6 @@ OBJS-$(CONFIG_AMRWB_DECODER) += amrwbdec.o celp_filters.o \ celp_math.o acelp_filters.o \ acelp_vectors.o \ acelp_pitch_delay.o -OBJS-$(CONFIG_AMV_DECODER) += sp5xdec.o mjpegdec.o mjpeg.o OBJS-$(CONFIG_ANM_DECODER) += anm.o OBJS-$(CONFIG_ANSI_DECODER) += ansi.o cga_data.o OBJS-$(CONFIG_APE_DECODER) += apedec.o |