diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:04:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-23 14:04:50 +0100 |
| commit | 6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (patch) | |
| tree | 5e04d38f8e152faf98921843ca5e4530cbdc46a4 /libavcodec/wmaprodec.c | |
| parent | b1b870fbd7185bffbe27c5918001b40a8ff8b920 (diff) | |
| parent | 42d324694883cdf1fff1612ac70fa403692a1ad4 (diff) | |
Merge commit '42d324694883cdf1fff1612ac70fa403692a1ad4'
* commit '42d324694883cdf1fff1612ac70fa403692a1ad4':
floatdsp: move vector_fmul_reverse from dsputil to avfloatdsp.
Conflicts:
libavcodec/arm/dsputil_init_vfp.c
libavcodec/arm/dsputil_vfp.S
libavcodec/dsputil.c
libavcodec/ppc/float_altivec.c
libavcodec/x86/dsputil.asm
libavutil/x86/float_dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaprodec.c')
| -rw-r--r-- | libavcodec/wmaprodec.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 7b68b3b653..c90a4b605e 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -170,7 +170,6 @@ typedef struct WMAProDecodeCtx { /* generic decoder variables */ AVCodecContext* avctx; ///< codec context for av_log AVFrame frame; ///< AVFrame for decoded output - DSPContext dsp; ///< accelerated DSP functions AVFloatDSPContext fdsp; uint8_t frame_data[MAX_FRAMESIZE + FF_INPUT_BUFFER_PADDING_SIZE];///< compressed frame data @@ -281,7 +280,6 @@ static av_cold int decode_init(AVCodecContext *avctx) int num_possible_block_sizes; s->avctx = avctx; - ff_dsputil_init(&s->dsp, avctx); avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); |