diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:16:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-16 02:16:29 +0100 |
| commit | e86f754b1c5f1e0d2e04e2f2c20885706ae50366 (patch) | |
| tree | d29859b1628bb64984128a3320c8aab0052f2bef /libavcodec/g722dsp.c | |
| parent | 39b40be2a1303013783df7cc184ffe1860ff31ce (diff) | |
| parent | 702458538d4e52809bcef460d39baabf061b16b5 (diff) | |
| download | ffmpeg-e86f754b1c5f1e0d2e04e2f2c20885706ae50366.tar.gz | |
Merge commit '702458538d4e52809bcef460d39baabf061b16b5'
* commit '702458538d4e52809bcef460d39baabf061b16b5':
g722: Add ARM NEON implementation for g722_apply_qmf()
Conflicts:
libavcodec/arm/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/g722dsp.c')
| -rw-r--r-- | libavcodec/g722dsp.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/g722dsp.c b/libavcodec/g722dsp.c index 0416d22ea3..051f89191d 100644 --- a/libavcodec/g722dsp.c +++ b/libavcodec/g722dsp.c @@ -68,4 +68,7 @@ static void g722_apply_qmf(const int16_t *prev_samples, int xout[2]) av_cold void ff_g722dsp_init(G722DSPContext *c) { c->apply_qmf = g722_apply_qmf; + + if (ARCH_ARM) + ff_g722dsp_init_arm(c); } |