Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 21:04:47 +0000 (23:04 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 21:04:47 +0000 (23:04 +0200)
* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
  configure: Factor out g722dsp module

Conflicts:
configure
libavcodec/arm/Makefile

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
configure
libavcodec/arm/Makefile

diff --cc configure
+++ b/configure
@@@ -1902,7 -1590,7 +1902,8 @@@ CONFIG_EXTRA=
      fdctdsp
      flacdsp
      fmtconvert
 +    frame_thread_encoder
+     g722dsp
      gcrypt
      gmp
      golomb
@@@ -2147,9 -1806,10 +2148,11 @@@ aac_fixed_decoder_select="mdct sinewin
  aac_encoder_select="audio_frame_queue iirfilter mdct sinewin"
  aac_latm_decoder_select="aac_decoder aac_latm_parser"
  ac3_decoder_select="ac3_parser ac3dsp bswapdsp fmtconvert mdct"
 +ac3_fixed_decoder_select="ac3_parser ac3dsp bswapdsp mdct"
  ac3_encoder_select="ac3dsp audiodsp mdct me_cmp"
  ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp"
+ adpcm_g722_decoder_select="g722dsp"
+ adpcm_g722_encoder_select="g722dsp"
  aic_decoder_select="golomb idctdsp"
  alac_encoder_select="lpc"
  als_decoder_select="bswapdsp"
@@@ -20,7 -20,7 +20,8 @@@ OBJS-$(CONFIG_IDCTDSP)                 
                                            arm/simple_idct_arm.o
  OBJS-$(CONFIG_FLACDSP)                 += arm/flacdsp_init_arm.o        \
                                            arm/flacdsp_arm.o
+ OBJS-$(CONFIG_G722DSP)                 += arm/g722dsp_init_arm.o
 +OBJS-$(CONFIG_LLAUDDSP)                += arm/lossless_audiodsp_init_arm.o
  OBJS-$(CONFIG_ME_CMP)                  += arm/me_cmp_init_arm.o
  OBJS-$(CONFIG_MPEGAUDIODSP)            += arm/mpegaudiodsp_init_arm.o
  OBJS-$(CONFIG_MPEGVIDEO)               += arm/mpegvideo_arm.o
@@@ -35,10 -35,8 +36,8 @@@ OBJS-$(CONFIG_VP8DSP)                  
  # decoders/encoders
  OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
                                            arm/sbrdsp_init_arm.o
- OBJS-$(CONFIG_ADPCM_G722_DECODER)      += arm/g722dsp_init_arm.o
- OBJS-$(CONFIG_ADPCM_G722_ENCODER)      += arm/g722dsp_init_arm.o
 -OBJS-$(CONFIG_APE_DECODER)             += arm/apedsp_init_arm.o
  OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_init_arm.o
 +OBJS-$(CONFIG_HEVC_DECODER)            += arm/hevcdsp_init_arm.o
  OBJS-$(CONFIG_MLP_DECODER)             += arm/mlpdsp_init_arm.o
  OBJS-$(CONFIG_RV40_DECODER)            += arm/rv40dsp_init_arm.o
  OBJS-$(CONFIG_VC1_DECODER)             += arm/vc1dsp_init_arm.o
@@@ -126,15 -125,9 +126,13 @@@ NEON-OBJS-$(CONFIG_VP8DSP)             
  # decoders/encoders
  NEON-OBJS-$(CONFIG_AAC_DECODER)        += arm/aacpsdsp_neon.o           \
                                            arm/sbrdsp_neon.o
- NEON-OBJS-$(CONFIG_ADPCM_G722_DECODER) += arm/g722dsp_neon.o
- NEON-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += arm/g722dsp_neon.o
 -NEON-OBJS-$(CONFIG_APE_DECODER)        += arm/apedsp_neon.o
 +NEON-OBJS-$(CONFIG_LLAUDDSP)           += arm/lossless_audiodsp_neon.o
  NEON-OBJS-$(CONFIG_DCA_DECODER)        += arm/dcadsp_neon.o             \
                                            arm/synth_filter_neon.o
 +NEON-OBJS-$(CONFIG_HEVC_DECODER)       += arm/hevcdsp_init_neon.o       \
 +                                          arm/hevcdsp_deblock_neon.o    \
 +                                          arm/hevcdsp_idct_neon.o       \
 +                                          arm/hevcdsp_qpel_neon.o
  NEON-OBJS-$(CONFIG_RV30_DECODER)       += arm/rv34dsp_neon.o
  NEON-OBJS-$(CONFIG_RV40_DECODER)       += arm/rv34dsp_neon.o            \
                                            arm/rv40dsp_neon.o