RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'ee964145b5d229571e00bf6883a44189d02babe2'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2015-02-28 23:41:36 +01:00
commit e82b0e6126
8 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aac.h
View File

@ -36,7 +36,6 @@
#include "fft.h" #include "fft.h"
#include "mpeg4audio.h" #include "mpeg4audio.h"
#include "sbr.h" #include "sbr.h"
#include "fmtconvert.h"
#include <stdint.h> #include <stdint.h>
@ -296,7 +295,6 @@ struct AACContext {
FFTContext mdct_ld; FFTContext mdct_ld;
FFTContext mdct_ltp; FFTContext mdct_ltp;
IMDCT15Context *mdct480; IMDCT15Context *mdct480;
FmtConvertContext fmt_conv;
AVFloatDSPContext *fdsp; AVFloatDSPContext *fdsp;
int random_state; int random_state;
/** @} */ /** @} */

2
libavcodec/aacdec.c
View File

@ -88,7 +88,6 @@
#include "get_bits.h" #include "get_bits.h"
#include "fft.h" #include "fft.h"
#include "imdct15.h" #include "imdct15.h"
#include "fmtconvert.h"
#include "lpc.h" #include "lpc.h"
#include "kbdwin.h" #include "kbdwin.h"
#include "sinewin.h" #include "sinewin.h"
@ -1133,7 +1132,6 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
ff_aac_sbr_init(); ff_aac_sbr_init();
ff_fmt_convert_init(&ac->fmt_conv, avctx);
ac->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT); ac->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
if (!ac->fdsp) { if (!ac->fdsp) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

3
libavcodec/atrac3.c
View File

@ -42,7 +42,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "fft.h" #include "fft.h"
#include "fmtconvert.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
@ -108,7 +107,6 @@ typedef struct ATRAC3Context {
AtracGCContext gainc_ctx; AtracGCContext gainc_ctx;
FFTContext mdct_ctx; FFTContext mdct_ctx;
FmtConvertContext fmt_conv;
AVFloatDSPContext *fdsp; AVFloatDSPContext *fdsp;
} ATRAC3Context; } ATRAC3Context;
@ -917,7 +915,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx)
ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3); ff_atrac_init_gain_compensation(&q->gainc_ctx, 4, 3);
q->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT); 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)); q->units = av_mallocz_array(avctx->channels, sizeof(*q->units));
if (!q->units || !q->fdsp) { if (!q->units || !q->fdsp) {

1
libavcodec/binkaudio.c
View File

@ -34,7 +34,6 @@
#include "get_bits.h" #include "get_bits.h"
#include "dct.h" #include "dct.h"
#include "rdft.h" #include "rdft.h"
#include "fmtconvert.h"
#include "internal.h" #include "internal.h"
#include "wma_freqs.h" #include "wma_freqs.h"
#include "libavutil/intfloat.h" #include "libavutil/intfloat.h"

1
libavcodec/nellymoserdec.c
View File

@ -37,7 +37,6 @@
#include "libavutil/random_seed.h" #include "libavutil/random_seed.h"
#include "avcodec.h" #include "avcodec.h"
#include "fft.h" #include "fft.h"
#include "fmtconvert.h"
#include "internal.h" #include "internal.h"
#include "nellymoser.h" #include "nellymoser.h"
#include "sinewin.h" #include "sinewin.h"

3
libavcodec/vorbisdec.c
View File

@ -35,7 +35,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "fft.h" #include "fft.h"
#include "fmtconvert.h"
#include "internal.h" #include "internal.h"
#include "vorbis.h" #include "vorbis.h"
@ -128,7 +127,6 @@ typedef struct vorbis_context_s {
GetBitContext gb; GetBitContext gb;
VorbisDSPContext dsp; VorbisDSPContext dsp;
AVFloatDSPContext *fdsp; AVFloatDSPContext *fdsp;
FmtConvertContext fmt_conv;
FFTContext mdct[2]; FFTContext mdct[2];
uint8_t first_frame; uint8_t first_frame;
@ -1031,7 +1029,6 @@ static av_cold int vorbis_decode_init(AVCodecContext *avctx)
vc->avctx = avctx; vc->avctx = avctx;
ff_vorbisdsp_init(&vc->dsp); ff_vorbisdsp_init(&vc->dsp);
ff_fmt_convert_init(&vc->fmt_conv, avctx);
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;

1
libavcodec/wma.c
View File

@ -91,7 +91,6 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2)
avctx->bit_rate <= 0) avctx->bit_rate <= 0)
return -1; return -1;
ff_fmt_convert_init(&s->fmt_conv, avctx);
if (avctx->codec->id == AV_CODEC_ID_WMAV1) if (avctx->codec->id == AV_CODEC_ID_WMAV1)
s->version = 1; s->version = 1;

2
libavcodec/wma.h
View File

@ -25,7 +25,6 @@
#include "libavutil/float_dsp.h" #include "libavutil/float_dsp.h"
#include "fft.h" #include "fft.h"
#include "fmtconvert.h"
#include "get_bits.h" #include "get_bits.h"
#include "put_bits.h" #include "put_bits.h"
@ -131,7 +130,6 @@ typedef struct WMACodecContext {
float lsp_pow_e_table[256]; float lsp_pow_e_table[256];
float lsp_pow_m_table1[(1 << LSP_POW_BITS)]; float lsp_pow_m_table1[(1 << LSP_POW_BITS)];
float lsp_pow_m_table2[(1 << LSP_POW_BITS)]; float lsp_pow_m_table2[(1 << LSP_POW_BITS)];
FmtConvertContext fmt_conv;
AVFloatDSPContext *fdsp; AVFloatDSPContext *fdsp;
#ifdef TRACE #ifdef TRACE