aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/g722dsp.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-16 02:16:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-16 02:16:29 +0100
commite86f754b1c5f1e0d2e04e2f2c20885706ae50366 (patch)
treed29859b1628bb64984128a3320c8aab0052f2bef /libavcodec/g722dsp.h
parent39b40be2a1303013783df7cc184ffe1860ff31ce (diff)
parent702458538d4e52809bcef460d39baabf061b16b5 (diff)
downloadffmpeg-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.h')
-rw-r--r--libavcodec/g722dsp.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/g722dsp.h b/libavcodec/g722dsp.h
index 210e107c79..cab4a5f7f2 100644
--- a/libavcodec/g722dsp.h
+++ b/libavcodec/g722dsp.h
@@ -28,5 +28,6 @@ typedef struct G722DSPContext {
} G722DSPContext;
void ff_g722dsp_init(G722DSPContext *c);
+void ff_g722dsp_init_arm(G722DSPContext *c);
#endif /* AVCODEC_G722DSP_H */