Merge commit '0a36988e48dd581d29e77f768f987738bdf365f0'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 04:11:37 +0000 (05:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 1 Mar 2014 04:11:37 +0000 (05:11 +0100)
* commit '0a36988e48dd581d29e77f768f987738bdf365f0':
  build: Let AMV decoder depend on the SP5X decoder

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile

diff --cc configure
+++ b/configure
@@@ -1889,8 -1638,7 +1889,8 @@@ 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"
++amv_decoder_select="sp5x_decoder exif"
 +amv_encoder_select="aandcttables"
  ape_decoder_select="dsputil"
  asv1_decoder_select="dsputil"
  asv1_encoder_select="dsputil"
@@@ -108,11 -96,6 +108,10 @@@ OBJS-$(CONFIG_AMRWB_DECODER)           
                                            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   \
 +                                          mpegvideo.o
  OBJS-$(CONFIG_ANM_DECODER)             += anm.o
  OBJS-$(CONFIG_ANSI_DECODER)            += ansi.o cga_data.o
  OBJS-$(CONFIG_APE_DECODER)             += apedec.o