diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index b71e8b607f..fed6bf4214 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -36,7 +36,6 @@
 #include "fft.h"
 #include "mpeg4audio.h"
 #include "sbr.h"
-#include "fmtconvert.h"
 
 #include <stdint.h>
 
@@ -293,7 +292,6 @@ typedef struct AACContext {
     FFTContext mdct_ld;
     FFTContext mdct_ltp;
     IMDCT15Context *mdct480;
-    FmtConvertContext fmt_conv;
     AVFloatDSPContext fdsp;
     int random_state;
     /** @} */
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 9a931824e8..c4234e7317 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -86,7 +86,6 @@
 #include "get_bits.h"
 #include "fft.h"
 #include "imdct15.h"
-#include "fmtconvert.h"
 #include "lpc.h"
 #include "kbdwin.h"
 #include "sinewin.h"
@@ -1043,7 +1042,6 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
 
     ff_aac_sbr_init();
 
-    ff_fmt_convert_init(&ac->fmt_conv, avctx);
     avpriv_float_dsp_init(&ac->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
     ac->random_state = 0x1f2e3d4c;
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 31f484464e..e8d2e2a875 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -41,7 +41,6 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "fft.h"
-#include "fmtconvert.h"
 #include "get_bits.h"
 #include "internal.h"
 
@@ -107,7 +106,6 @@ typedef struct ATRAC3Context {
 
     AtracGCContext  gainc_ctx;
     FFTContext mdct_ctx;
-    FmtConvertContext fmt_conv;
     AVFloatDSPContext fdsp;
 } ATRAC3Context;
 
@@ -910,7 +908,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
 
     ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3);
     avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
-    ff_fmt_convert_init(&q->fmt_conv, avctx);
 
     q->units = av_mallocz(sizeof(*q->units) * avctx->channels);
     if (!q->units) {
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index ffc8f87b13..0b427bfb90 100644
--- a/libavcodec/binkaudio.c
+++ b/libavcodec/binkaudio.c
@@ -34,7 +34,6 @@
 #include "get_bits.h"
 #include "dct.h"
 #include "rdft.h"
-#include "fmtconvert.h"
 #include "internal.h"
 #include "wma_freqs.h"
 #include "libavutil/intfloat.h"
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 3b9b77cc53..e86846679e 100644
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -37,7 +37,6 @@
 #include "libavutil/random_seed.h"
 #include "avcodec.h"
 #include "fft.h"
-#include "fmtconvert.h"
 #include "internal.h"
 #include "nellymoser.h"
 #include "sinewin.h"
diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c
index d52bfd5d61..59c582b93e 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -30,7 +30,6 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "fft.h"
-#include "fmtconvert.h"
 #include "internal.h"
 
 #include "vorbis.h"
@@ -123,7 +122,6 @@ typedef struct vorbis_context_s {
     GetBitContext gb;
     VorbisDSPContext dsp;
     AVFloatDSPContext fdsp;
-    FmtConvertContext fmt_conv;
 
     FFTContext mdct[2];
     uint8_t       first_frame;
@@ -1018,7 +1016,6 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx)
     vc->avctx = avctx;
     ff_vorbisdsp_init(&vc->dsp);
     avpriv_float_dsp_init(&vc->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
-    ff_fmt_convert_init(&vc->fmt_conv, avctx);
 
     avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
 
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index 9fd2a110c8..ad948d1cdc 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -94,7 +94,6 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
         avctx->bit_rate    <= 0)
         return -1;
 
-    ff_fmt_convert_init(&s->fmt_conv, avctx);
     avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
 
     if (avctx->codec->id == AV_CODEC_ID_WMAV1)
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index 3a9de40407..afa3b0dd3c 100644
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -25,7 +25,6 @@
 #include "libavutil/float_dsp.h"
 
 #include "fft.h"
-#include "fmtconvert.h"
 #include "get_bits.h"
 #include "put_bits.h"
 
@@ -131,7 +130,6 @@ typedef struct WMACodecContext {
     float lsp_pow_e_table[256];
     float lsp_pow_m_table1[(1 << LSP_POW_BITS)];
     float lsp_pow_m_table2[(1 << LSP_POW_BITS)];
-    FmtConvertContext fmt_conv;
     AVFloatDSPContext fdsp;
 
 #ifdef TRACE