aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-28 23:41:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-28 23:41:36 +0100
commite82b0e612607d652c1519ee31d30272113775679 (patch)
tree9e58ce913ebb7fd54257eb67806d5e4351d4a79e /libavcodec
parentca6fee7606866a0cb7676b95db4c462500cc8d2d (diff)
parentee964145b5d229571e00bf6883a44189d02babe2 (diff)
downloadffmpeg-e82b0e612607d652c1519ee31d30272113775679.tar.gz
Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'
* commit 'ee964145b5d229571e00bf6883a44189d02babe2': lavc: remove unused traces of fmtconvert usage Conflicts: libavcodec/aac.h libavcodec/aacdec.c libavcodec/atrac3.c libavcodec/vorbisdec.c libavcodec/wma.c libavcodec/wma.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/aac.h2
-rw-r--r--libavcodec/aacdec.c2
-rw-r--r--libavcodec/atrac3.c3
-rw-r--r--libavcodec/binkaudio.c1
-rw-r--r--libavcodec/nellymoserdec.c1
-rw-r--r--libavcodec/vorbisdec.c3
-rw-r--r--libavcodec/wma.c1
-rw-r--r--libavcodec/wma.h2
8 files changed, 0 insertions, 15 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index 3d0caedc63..e9c373fc34 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>
@@ -296,7 +295,6 @@ 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 38796006e8..9fafeaef50 100644
--- a/libavcodec/aacdec.c
+++ b/libavcodec/aacdec.c
@@ -88,7 +88,6 @@
#include "get_bits.h"
#include "fft.h"
#include "imdct15.h"
-#include "fmtconvert.h"
#include "lpc.h"
#include "kbdwin.h"
#include "sinewin.h"
@@ -1133,7 +1132,6 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
ff_aac_sbr_init();
- ff_fmt_convert_init(&ac->fmt_conv, avctx);
ac->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
if (!ac->fdsp) {
return AVERROR(ENOMEM);
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 9dc0811dab..5aa3d8df1a 100644
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -42,7 +42,6 @@
#include "avcodec.h"
#include "bytestream.h"
#include "fft.h"
-#include "fmtconvert.h"
#include "get_bits.h"
#include "internal.h"
@@ -108,7 +107,6 @@ typedef struct ATRAC3Context {
AtracGCContext gainc_ctx;
FFTContext mdct_ctx;
- FmtConvertContext fmt_conv;
AVFloatDSPContext *fdsp;
} ATRAC3Context;
@@ -917,7 +915,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3);
q->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
- ff_fmt_convert_init(&q->fmt_conv, avctx);
q->units = av_mallocz_array(avctx->channels, sizeof(*q->units));
if (!q->units || !q->fdsp) {
diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c
index d16b865303..f30ea1236f 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 2d8a594200..d5a69ed0de 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 35eb2be0e1..0fce735d61 100644
--- a/libavcodec/vorbisdec.c
+++ b/libavcodec/vorbisdec.c
@@ -35,7 +35,6 @@
#include "avcodec.h"
#include "get_bits.h"
#include "fft.h"
-#include "fmtconvert.h"
#include "internal.h"
#include "vorbis.h"
@@ -128,7 +127,6 @@ typedef struct vorbis_context_s {
GetBitContext gb;
VorbisDSPContext dsp;
AVFloatDSPContext *fdsp;
- FmtConvertContext fmt_conv;
FFTContext mdct[2];
uint8_t first_frame;
@@ -1031,7 +1029,6 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx)
vc->avctx = avctx;
ff_vorbisdsp_init(&vc->dsp);
- 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 3bc6099389..d8949d5f5f 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -91,7 +91,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);
if (avctx->codec->id == AV_CODEC_ID_WMAV1)
s->version = 1;
diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index 8d337df1dd..b776c5338a 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