Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 19:42:14 +0000 (21:42 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 19:42:14 +0000 (21:42 +0200)
* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
  configure: Factor out flacdsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile

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

diff --cc configure
+++ b/configure
@@@ -1900,8 -1588,8 +1900,9 @@@ CONFIG_EXTRA=
      faandct
      faanidct
      fdctdsp
+     flacdsp
      fmtconvert
 +    frame_thread_encoder
      gcrypt
      gmp
      golomb
@@@ -2189,12 -1842,11 +2190,12 @@@ ffv1_encoder_select="rangecoder
  ffvhuff_decoder_select="huffyuv_decoder"
  ffvhuff_encoder_select="huffyuv_encoder"
  fic_decoder_select="golomb"
- flac_decoder_select="golomb"
- flac_encoder_select="bswapdsp golomb lpc"
+ flac_decoder_select="flacdsp golomb"
+ flac_encoder_select="bswapdsp flacdsp golomb lpc"
 -flashsv_decoder_deps="zlib"
 -flashsv_encoder_deps="zlib"
 -flashsv2_decoder_deps="zlib"
 +flashsv_decoder_select="zlib"
 +flashsv_encoder_select="zlib"
 +flashsv2_encoder_select="zlib"
 +flashsv2_decoder_select="zlib"
  flv_decoder_select="h263_decoder"
  flv_encoder_select="h263_encoder"
  fourxm_decoder_select="blockdsp bswapdsp"
@@@ -54,8 -46,8 +54,9 @@@ OBJS-$(CONFIG_FAANIDCT)                
  OBJS-$(CONFIG_FDCTDSP)                 += fdctdsp.o jfdctfst.o jfdctint.o
  FFT-OBJS-$(CONFIG_HARDCODED_TABLES)    += cos_tables.o cos_fixed_tables.o
  OBJS-$(CONFIG_FFT)                     += avfft.o fft_fixed.o fft_float.o \
 +                                          fft_fixed_32.o fft_init_table.o \
                                            $(FFT-OBJS-yes)
+ OBJS-$(CONFIG_FLACDSP)                 += flacdsp.o
  OBJS-$(CONFIG_FMTCONVERT)              += fmtconvert.o
  OBJS-$(CONFIG_GOLOMB)                  += golomb.o
  OBJS-$(CONFIG_H263DSP)                 += h263dsp.o
@@@ -247,13 -205,11 +248,13 @@@ OBJS-$(CONFIG_EVRC_DECODER)            
  OBJS-$(CONFIG_EXR_DECODER)             += exr.o
  OBJS-$(CONFIG_FFV1_DECODER)            += ffv1dec.o ffv1.o
  OBJS-$(CONFIG_FFV1_ENCODER)            += ffv1enc.o ffv1.o
 +OBJS-$(CONFIG_FFWAVESYNTH_DECODER)     += ffwavesynth.o
  OBJS-$(CONFIG_FIC_DECODER)             += fic.o
- OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.o flacdata.o flac.o flacdsp.o
- OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o flacdsp.o vorbis_data.o
+ OBJS-$(CONFIG_FLAC_DECODER)            += flacdec.o flacdata.o flac.o
 -OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o
++OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o flacdata.o flac.o vorbis_data.o
  OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
  OBJS-$(CONFIG_FLASHSV_ENCODER)         += flashsvenc.o
 +OBJS-$(CONFIG_FLASHSV2_ENCODER)        += flashsv2enc.o
  OBJS-$(CONFIG_FLASHSV2_DECODER)        += flashsv.o
  OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
  OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
@@@ -18,7 -18,8 +18,9 @@@ OBJS-$(CONFIG_IDCTDSP)                 
                                            arm/idctdsp_arm.o             \
                                            arm/jrevdct_arm.o             \
                                            arm/simple_idct_arm.o
+ OBJS-$(CONFIG_FLACDSP)                 += arm/flacdsp_init_arm.o        \
+                                           arm/flacdsp_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
@@@ -31,13 -32,10 +33,10 @@@ OBJS-$(CONFIG_VP3DSP)                  
  # decoders/encoders
  OBJS-$(CONFIG_AAC_DECODER)             += arm/aacpsdsp_init_arm.o       \
                                            arm/sbrdsp_init_arm.o
 -OBJS-$(CONFIG_APE_DECODER)             += arm/apedsp_init_arm.o
 -OBJS-$(CONFIG_DCA_DECODER)             += arm/dcadsp_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_FLAC_DECODER)            += arm/flacdsp_init_arm.o        \
-                                           arm/flacdsp_arm.o
- OBJS-$(CONFIG_FLAC_ENCODER)            += arm/flacdsp_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_VC1_DECODER)             += arm/vc1dsp_init_arm.o
  OBJS-$(CONFIG_VORBIS_DECODER)          += arm/vorbisdsp_init_arm.o