Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / ac3enc_float.c

diff --git a/ffmpeg/libavcodec/ac3enc_float.c b/ffmpeg/libavcodec/ac3enc_float.c
index fa6e50981bf681df54905832638547f8a56d1089..766b14ec13f1adafa76ba189e117f56d436620c4 100644 (file)
--- a/ffmpeg/libavcodec/ac3enc_float.c
+++ b/ffmpeg/libavcodec/ac3enc_float.c
@@ -139,7 +139,9 @@ static CoefType calc_cpl_coord(CoefSumType energy_ch, CoefSumType energy_cpl)
 av_cold int ff_ac3_float_encode_init(AVCodecContext *avctx)
 {
     AC3EncodeContext *s = avctx->priv_data;
-    avpriv_float_dsp_init(&s->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
+    s->fdsp = avpriv_float_dsp_alloc(avctx->flags & CODEC_FLAG_BITEXACT);
+    if (!s->fdsp)
+        return AVERROR(ENOMEM);
     return ff_ac3_encode_init(avctx);
 }