diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 05:11:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-01 05:11:37 +0100 |
| commit | c4c2b2ea5c0a1879f512c2023956d7322edc98d3 (patch) | |
| tree | 8967a82887bfff277faf03560514f78fe81bc780 | |
| parent | 5aab33dea38ee262d6345e8348a184609a2ee46e (diff) | |
| parent | 0a36988e48dd581d29e77f768f987738bdf365f0 (diff) | |
| download | ffmpeg-c4c2b2ea5c0a1879f512c2023956d7322edc98d3.tar.gz | |
Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'
* commit '0a36988e48dd581d29e77f768f987738bdf365f0':
build: Let AMV decoder depend on the SP5X decoder
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 1 |
2 files changed, 1 insertions, 2 deletions
@@ -1889,7 +1889,7 @@ alac_encoder_select="lpc" als_decoder_select="dsputil" amrnb_decoder_select="lsp" amrwb_decoder_select="lsp" -amv_decoder_select="dsputil hpeldsp exif" +amv_decoder_select="sp5x_decoder exif" amv_encoder_select="aandcttables" ape_decoder_select="dsputil" asv1_decoder_select="dsputil" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6ff8a1caa1..7982b52eab 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -108,7 +108,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_AMV_ENCODER) += mjpegenc.o mjpeg.o \ mpegvideo_enc.o motion_est.o \ ratecontrol.o mpeg12data.o \ |