summaryrefslogtreecommitdiff
path: root/libavcodec/wma.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-23 14:13:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-23 14:13:54 +0100
commit24604ebaf85b5436d10da811f455dd710b353aca (patch)
tree46988a19c56e7914715dc3852e6588fb887c6c77 /libavcodec/wma.c
parent6e6e1708984e45881b9a5d4e26c3e7de852c54d5 (diff)
parent5959bfaca396ecaf63a8123055f499688b79cae3 (diff)
downloadffmpeg-24604ebaf85b5436d10da811f455dd710b353aca.tar.gz
Merge commit '5959bfaca396ecaf63a8123055f499688b79cae3'
* commit '5959bfaca396ecaf63a8123055f499688b79cae3': floatdsp: move butterflies_float from dsputil to avfloatdsp. Conflicts: libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/imc.c libavcodec/mpegaudiodec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wma.c')
-rw-r--r--libavcodec/wma.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/wma.c b/libavcodec/wma.c
index d0c0b34868..5af20739a5 100644
--- a/libavcodec/wma.c
+++ b/libavcodec/wma.c
@@ -82,7 +82,6 @@ int ff_wma_init(AVCodecContext *avctx, int flags2)
|| avctx->bit_rate <= 0)
return -1;
- ff_dsputil_init(&s->dsp, avctx);
ff_fmt_convert_init(&s->fmt_conv, avctx);
avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);