Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'

[ffmpeg] / libavcodec / g722enc.c

diff --git a/libavcodec/g722enc.c b/libavcodec/g722enc.c
index 17dde9ec809837f0d0cd290885fef23dd897257d..c982a0eb78f4f7e1c24e6539b2e8abc4f2af3811 100644 (file)
--- a/libavcodec/g722enc.c
+++ b/libavcodec/g722enc.c
@@ -120,6 +120,8 @@ static av_cold int g722_encode_init(AVCodecContext * avctx)
         }
     }
 
+    ff_g722dsp_init(&c->dsp);
+
     return 0;
 error:
     g722_encode_close(avctx);
@@ -139,7 +141,7 @@ static inline void filter_samples(G722Context *c, const int16_t *samples,
     int xout1, xout2;
     c->prev_samples[c->prev_samples_pos++] = samples[0];
     c->prev_samples[c->prev_samples_pos++] = samples[1];
-    ff_g722_apply_qmf(c->prev_samples + c->prev_samples_pos - 24, &xout1, &xout2);
+    c->dsp.apply_qmf(c->prev_samples + c->prev_samples_pos - 24, &xout1, &xout2);
     *xlow  = xout1 + xout2 >> 14;
     *xhigh = xout1 - xout2 >> 14;
     if (c->prev_samples_pos >= PREV_SAMPLES_BUF_SIZE) {