qsv: Load the hw hevc plugin by default on Linux

[ffmpeg] / libavcodec / g722.h

diff --git a/libavcodec/g722.h b/libavcodec/g722.h
index bab1da48cc3f4c680ce4b3e438e782c6f110060f..483017018b1bee1b988de4936d92f64eb0eb7d78 100644 (file)
--- a/libavcodec/g722.h
+++ b/libavcodec/g722.h
@@ -27,12 +27,12 @@
 
 #include <stdint.h>
 #include "avcodec.h"
+#include "g722dsp.h"
 
 #define PREV_SAMPLES_BUF_SIZE 1024
 
 typedef struct G722Context {
     const AVClass *class;
-    AVFrame frame;
     int     bits_per_codeword;
     int16_t prev_samples[PREV_SAMPLES_BUF_SIZE]; ///< memory of past decoded samples
     int     prev_samples_pos;        ///< the number of values in prev_samples
@@ -62,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];
@@ -73,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 */