diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 12:24:16 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 12:24:16 +0100 |
commit | aa97223f14a1aad2a54fc87dd196c2c5e6ba6f40 (patch) | |
tree | b5e3811f5a6962310a60da6a7bbf50a520751251 /libavfilter | |
parent | 06d27428995bd3ea73ca1c62640ca98893093a84 (diff) | |
download | ffmpeg-streaming-aa97223f14a1aad2a54fc87dd196c2c5e6ba6f40.zip ffmpeg-streaming-aa97223f14a1aad2a54fc87dd196c2c5e6ba6f40.tar.gz |
avfilter/af_amix: Use avpriv_float_dsp_alloc()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r-- | libavfilter/af_amix.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 47cbb45..e40969f 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -155,7 +155,7 @@ static int frame_list_add_frame(FrameList *frame_list, int nb_samples, int64_t p typedef struct MixContext { const AVClass *class; /**< class for AVOptions */ - AVFloatDSPContext fdsp; + AVFloatDSPContext *fdsp; int nb_inputs; /**< number of inputs */ int active_inputs; /**< number of input currently active */ @@ -298,7 +298,7 @@ static int output_frame(AVFilterLink *outlink, int nb_samples) plane_size = FFALIGN(plane_size, 16); for (p = 0; p < planes; p++) { - s->fdsp.vector_fmac_scalar((float *)out_buf->extended_data[p], + s->fdsp->vector_fmac_scalar((float *)out_buf->extended_data[p], (float *) in_buf->extended_data[p], s->input_scale[i], plane_size); } @@ -501,7 +501,9 @@ static av_cold int init(AVFilterContext *ctx) ff_insert_inpad(ctx, i, &pad); } - avpriv_float_dsp_init(&s->fdsp, 0); + s->fdsp = avpriv_float_dsp_alloc(0); + if (!s->fdsp) + return AVERROR(ENOMEM); return 0; } @@ -520,6 +522,7 @@ static av_cold void uninit(AVFilterContext *ctx) av_freep(&s->frame_list); av_freep(&s->input_state); av_freep(&s->input_scale); + av_freep(&s->fdsp); for (i = 0; i < ctx->nb_inputs; i++) av_freep(&ctx->input_pads[i].name); |