Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:06:42 +0000 (00:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:06:42 +0000 (00:06 +0100)
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
  lavc: do not compile fmtconvert unconditionally

Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile

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

diff --cc configure
+++ b/configure
@@@ -1856,7 -1567,7 +1856,8 @@@ CONFIG_EXTRA=
      faandct
      faanidct
      fdctdsp
+     fmtconvert
 +    frame_thread_encoder
      gcrypt
      golomb
      gplv3
@@@ -2074,8 -1762,7 +2075,8 @@@ mpegvideoenc_select="me_cmp mpegvideo p
  aac_decoder_select="imdct15 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 mdct"
+ 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"
  aic_decoder_select="golomb idctdsp"
@@@ -2104,8 -1788,7 +2105,8 @@@ comfortnoise_encoder_select="lpc
  cook_decoder_select="audiodsp mdct sinewin"
  cscd_decoder_select="lzo"
  cscd_decoder_suggest="zlib"
- dca_decoder_select="mdct"
+ dca_decoder_select="fmtconvert mdct"
 +dirac_decoder_select="dwt golomb videodsp mpegvideoenc"
  dnxhd_decoder_select="blockdsp idctdsp"
  dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp"
  dvvideo_decoder_select="dvprofile idctdsp"
@@@ -24,8 -19,8 +24,7 @@@ OBJS = allcodecs.
         bitstream_filter.o                                               \
         codec_desc.o                                                     \
         dv_profile.o                                                     \
-        fmtconvert.o                                                     \
         imgconvert.o                                                     \
 -       log2_tab.o                                                       \
         mathtables.o                                                     \
         options.o                                                        \
         parser.o                                                         \
@@@ -54,8 -45,8 +53,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_FMTCONVERT)              += fmtconvert.o
  OBJS-$(CONFIG_GOLOMB)                  += golomb.o
  OBJS-$(CONFIG_H263DSP)                 += h263dsp.o
  OBJS-$(CONFIG_H264CHROMA)              += h264chroma.o
Simple merge
@@@ -4,10 -2,10 +2,11 @@@
  OBJS-$(CONFIG_AUDIODSP)                += ppc/audiodsp.o
  OBJS-$(CONFIG_BLOCKDSP)                += ppc/blockdsp.o
  OBJS-$(CONFIG_FFT)                     += ppc/fft_init.o                \
 -                                          ppc/fft_altivec.o
 +                                          ppc/fft_altivec.o             \
 +                                          ppc/fft_vsx.o
+ OBJS-$(CONFIG_FMTCONVERT)              += ppc/fmtconvert_altivec.o
  OBJS-$(CONFIG_H264CHROMA)              += ppc/h264chroma_init.o
 -OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp.o
 +OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp.o ppc/hpeldsp_altivec.o
  OBJS-$(CONFIG_H264QPEL)                += ppc/h264qpel.o
  OBJS-$(CONFIG_HPELDSP)                 += ppc/hpeldsp_altivec.o
  OBJS-$(CONFIG_HUFFYUVDSP)              += ppc/huffyuvdsp_altivec.o
@@@ -9,8 -8,7 +8,9 @@@ OBJS-$(CONFIG_BSWAPDSP)                
  OBJS-$(CONFIG_DCT)                     += x86/dct_init.o
  OBJS-$(CONFIG_FDCTDSP)                 += x86/fdctdsp_init.o
  OBJS-$(CONFIG_FFT)                     += x86/fft_init.o
 +OBJS-$(CONFIG_FLAC_DECODER)            += x86/flacdsp_init.o
 +OBJS-$(CONFIG_FLAC_ENCODER)            += x86/flacdsp_init.o
+ OBJS-$(CONFIG_FMTCONVERT)              += x86/fmtconvert_init.o
  OBJS-$(CONFIG_H263DSP)                 += x86/h263dsp_init.o
  OBJS-$(CONFIG_H264CHROMA)              += x86/h264chroma_init.o
  OBJS-$(CONFIG_H264DSP)                 += x86/h264dsp_init.o
@@@ -87,17 -78,11 +86,18 @@@ YASM-OBJS                              
  # subsystems
  YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
  YASM-OBJS-$(CONFIG_AUDIODSP)           += x86/audiodsp.o
 +YASM-OBJS-$(CONFIG_BLOCKDSP)           += x86/blockdsp.o
  YASM-OBJS-$(CONFIG_BSWAPDSP)           += x86/bswapdsp.o
  YASM-OBJS-$(CONFIG_DCT)                += x86/dct32.o
 +YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\
 +                                          x86/dwt_yasm.o
  YASM-OBJS-$(CONFIG_DNXHD_ENCODER)      += x86/dnxhdenc.o
  YASM-OBJS-$(CONFIG_FFT)                += x86/fft.o
 +YASM-OBJS-$(CONFIG_FLAC_DECODER)       += x86/flacdsp.o
 +ifdef CONFIG_GPL
 +YASM-OBJS-$(CONFIG_FLAC_ENCODER)       += x86/flac_dsp_gpl.o
 +endif
+ YASM-OBJS-$(CONFIG_FMTCONVERT)         += x86/fmtconvert.o
  YASM-OBJS-$(CONFIG_H263DSP)            += x86/h263_loopfilter.o
  YASM-OBJS-$(CONFIG_H264CHROMA)         += x86/h264_chromamc.o           \
                                            x86/h264_chromamc_10bit.o