Merge commit '31d2039cb42668ebcf08248bc48bbad44aa05f49'

[ffmpeg] / libavcodec / g722.h

diff --git a/libavcodec/g722.h b/libavcodec/g722.h
index 3f89827670dc3ed82b59e79494975b4c6eb2f844..25676a326e2e2b34000bc0d2052d056043ae8e04 100644 (file)
--- a/libavcodec/g722.h
+++ b/libavcodec/g722.h
@@ -27,6 +27,7 @@
 
 #include <stdint.h>
 #include "avcodec.h"
+#include "g722dsp.h"
 
 #define PREV_SAMPLES_BUF_SIZE 1024
 
@@ -61,6 +62,8 @@ typedef struct G722Context {
         int value;
         int prev;
     } *paths[2];
+
+    G722DSPContext dsp;
 } G722Context;
 
 extern const int16_t ff_g722_high_inv_quant[4];
@@ -72,6 +75,4 @@ void ff_g722_update_low_predictor(struct G722Band *band, const int ilow);
 void ff_g722_update_high_predictor(struct G722Band *band, const int dhigh,
                                    const int ihigh);
 
-void ff_g722_apply_qmf(const int16_t *prev_samples, int *xout1, int *xout2);
-
 #endif /* AVCODEC_G722_H */