@@ -1567,6 +1567,7 @@ CONFIG_EXTRA="

     faandct

     faanidct

     fdctdsp

+    fmtconvert

     gcrypt

     golomb

     gplv3

@@ -1761,7 +1762,7 @@ mpegvideoenc_select="me_cmp mpegvideo pixblockdsp qpeldsp"

 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_encoder_select="ac3dsp audiodsp mdct me_cmp"

 ac3_fixed_encoder_select="ac3dsp audiodsp mdct me_cmp"

 aic_decoder_select="golomb idctdsp"

@@ -1787,7 +1788,7 @@ 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"

 dnxhd_decoder_select="blockdsp idctdsp"

 dnxhd_encoder_select="aandcttables blockdsp fdctdsp idctdsp mpegvideoenc pixblockdsp"

 dvvideo_decoder_select="dvprofile idctdsp"

@@ -19,7 +19,6 @@ OBJS = allcodecs.o                                                      \

        bitstream_filter.o                                               \

        codec_desc.o                                                     \

        dv_profile.o                                                     \

-       fmtconvert.o                                                     \

        imgconvert.o                                                     \

        log2_tab.o                                                       \

        mathtables.o                                                     \

@@ -47,6 +46,7 @@ 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-OBJS-yes)

+OBJS-$(CONFIG_FMTCONVERT)              += fmtconvert.o

 OBJS-$(CONFIG_GOLOMB)                  += golomb.o

 OBJS-$(CONFIG_H263DSP)                 += h263dsp.o

 OBJS-$(CONFIG_H264CHROMA)              += h264chroma.o

@@ -1,7 +1,5 @@

 ARCH_HEADERS = mathops.h

-OBJS                                   += arm/fmtconvert_init_arm.o

-

 # subsystems

 OBJS-$(CONFIG_AC3DSP)                  += arm/ac3dsp_init_arm.o         \

                                           arm/ac3dsp_arm.o

@@ -9,6 +7,7 @@ OBJS-$(CONFIG_AUDIODSP)                += arm/audiodsp_init_arm.o

 OBJS-$(CONFIG_BLOCKDSP)                += arm/blockdsp_init_arm.o

 OBJS-$(CONFIG_FFT)                     += arm/fft_init_arm.o            \

                                           arm/fft_fixed_init_arm.o

+OBJS-$(CONFIG_FMTCONVERT)              += arm/fmtconvert_init_arm.o

 OBJS-$(CONFIG_H264CHROMA)              += arm/h264chroma_init_arm.o

 OBJS-$(CONFIG_H264DSP)                 += arm/h264dsp_init_arm.o

 OBJS-$(CONFIG_H264PRED)                += arm/h264pred_init_arm.o

@@ -86,10 +85,10 @@ ARMV6-OBJS-$(CONFIG_VP8_DECODER)       += arm/vp8_armv6.o               \

 # VFP optimizations

-VFP-OBJS                               += arm/fmtconvert_vfp.o

 # subsystems

 VFP-OBJS-$(CONFIG_FFT)                 += arm/fft_vfp.o

+VFP-OBJS-$(CONFIG_FMTCONVERT)          += arm/fmtconvert_vfp.o

 VFP-OBJS-$(CONFIG_MDCT)                += arm/mdct_vfp.o

 # decoders/encoders

@@ -98,7 +97,6 @@ VFP-OBJS-$(CONFIG_DCA_DECODER)         += arm/dcadsp_vfp.o              \

 # NEON optimizations

-NEON-OBJS                              += arm/fmtconvert_neon.o

 # subsystems

 NEON-OBJS-$(CONFIG_AC3DSP)             += arm/ac3dsp_neon.o

@@ -109,6 +107,7 @@ NEON-OBJS-$(CONFIG_BLOCKDSP)           += arm/blockdsp_init_neon.o      \

                                           arm/blockdsp_neon.o

 NEON-OBJS-$(CONFIG_FFT)                += arm/fft_neon.o                \

                                           arm/fft_fixed_neon.o

+NEON-OBJS-$(CONFIG_FMTCONVERT)         += arm/fmtconvert_neon.o

 NEON-OBJS-$(CONFIG_H264CHROMA)         += arm/h264cmc_neon.o

 NEON-OBJS-$(CONFIG_H264DSP)            += arm/h264dsp_neon.o            \

                                           arm/h264idct_neon.o

@@ -1,10 +1,9 @@

-OBJS                                   += ppc/fmtconvert_altivec.o      \

-

 # subsystems

 OBJS-$(CONFIG_AUDIODSP)                += ppc/audiodsp.o

 OBJS-$(CONFIG_BLOCKDSP)                += ppc/blockdsp.o

 OBJS-$(CONFIG_FFT)                     += ppc/fft_init.o                \

                                           ppc/fft_altivec.o

+OBJS-$(CONFIG_FMTCONVERT)              += ppc/fmtconvert_altivec.o

 OBJS-$(CONFIG_H264CHROMA)              += ppc/h264chroma_init.o

 OBJS-$(CONFIG_H264DSP)                 += ppc/h264dsp.o

 OBJS-$(CONFIG_H264QPEL)                += ppc/h264qpel.o

@@ -1,5 +1,4 @@

 OBJS                                   += x86/constants.o               \

-                                          x86/fmtconvert_init.o         \

 # subsystems

 OBJS-$(CONFIG_AC3DSP)                  += x86/ac3dsp_init.o

@@ -9,6 +8,7 @@ OBJS-$(CONFIG_BSWAPDSP)                += x86/bswapdsp_init.o

 OBJS-$(CONFIG_DCT)                     += x86/dct_init.o

 OBJS-$(CONFIG_FDCTDSP)                 += x86/fdctdsp_init.o

 OBJS-$(CONFIG_FFT)                     += x86/fft_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

@@ -74,7 +74,6 @@ MMX-OBJS-$(CONFIG_VC1_DECODER)         += x86/vc1dsp_mmx.o

 # YASM optimizations

 YASM-OBJS                              += x86/deinterlace.o             \

-                                          x86/fmtconvert.o              \

 # subsystems

 YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o

@@ -83,6 +82,7 @@ YASM-OBJS-$(CONFIG_BSWAPDSP)           += x86/bswapdsp.o

 YASM-OBJS-$(CONFIG_DCT)                += x86/dct32.o

 YASM-OBJS-$(CONFIG_DNXHD_ENCODER)      += x86/dnxhdenc.o

 YASM-OBJS-$(CONFIG_FFT)                += x86/fft.o

+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