Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / mpegaudiodsp.h

diff --git a/libavcodec/mpegaudiodsp.h b/libavcodec/mpegaudiodsp.h
index 597e2533f5116d71902611d25f62f01ebe5b08d2..9e84784403bb1379f003a27f04f65d455785c0ab 100644 (file)
--- a/libavcodec/mpegaudiodsp.h
+++ b/libavcodec/mpegaudiodsp.h
@@ -28,6 +28,8 @@ typedef struct MPADSPContext {
                                int *dither_state, int16_t *samples, int incr);
     void (*dct32_float)(float *dst, const float *src);
     void (*dct32_fixed)(int *dst, const int *src);
+    void (*imdct36_float)(float *out, float *buf, float *in, float *win);
+    void (*imdct36_fixed)(int *out, int *buf, int *in, int *win);
 } MPADSPContext;
 
 void ff_mpadsp_init(MPADSPContext *s);
@@ -47,6 +49,7 @@ void ff_mpa_synth_filter_float(MPADSPContext *s,
                                float *samples, int incr,
                                float *sb_samples);
 
+void ff_mpadsp_init_arm(MPADSPContext *s);
 void ff_mpadsp_init_mmx(MPADSPContext *s);
 void ff_mpadsp_init_altivec(MPADSPContext *s);
 
@@ -60,4 +63,7 @@ void ff_mpadsp_apply_window_fixed(int32_t *synth_buf, int32_t *window,
                                   int *dither_state, int16_t *samples,
                                   int incr);
 
-#endif
+void ff_imdct36_fixed(int *out, int *buf, int *in, int *win);
+void ff_imdct36_float(float *out, float *buf, float *in, float *win);
+
+#endif /* AVCODEC_MPEGAUDIODSP_H */