diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:45:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 01:46:35 +0100 |
| commit | 47df21e1727c83648a645b0dde34e99f1b7bdc93 (patch) | |
| tree | ed098a84b05dde35955ca00471464be09a6eba78 /libavcodec/g722.h | |
| parent | 38e641a060e0c00930851a8053ca96250b3ecccc (diff) | |
| parent | 67690683130faf37dd9d969ced15eba2a1940ade (diff) | |
| download | ffmpeg-streaming-47df21e1727c83648a645b0dde34e99f1b7bdc93.zip ffmpeg-streaming-47df21e1727c83648a645b0dde34e99f1b7bdc93.tar.gz | |
Merge commit '67690683130faf37dd9d969ced15eba2a1940ade'
* commit '67690683130faf37dd9d969ced15eba2a1940ade':
g722: Split out g722_qmf_apply() function into g722dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722.h')
| -rw-r--r-- | libavcodec/g722.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/g722.h b/libavcodec/g722.h index 3f89827..25676a3 100644 --- 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 */ |
