Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

[ffmpeg] / libavcodec / mpc.h

diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 8b4deef689b8d62ba5ed6fdb23eb295cec32e8c1..7ee402b3560f394b70b849ddfda38926a72b584c 100644 (file)
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -41,7 +41,7 @@
 #define MPC_FRAME_SIZE   (BANDS * SAMPLES_PER_BAND)
 
 /** Subband structure - hold all variables for each subband */
-typedef struct {
+typedef struct Band {
     int msf; ///< mid-stereo flag
     int res[2];
     int scfi[2];
@@ -49,7 +49,7 @@ typedef struct {
     int Q[2];
 }Band;
 
-typedef struct {
+typedef struct MPCContext {
     AVFrame frame;
     DSPContext dsp;
     MPADSPContext mpadsp;
@@ -73,6 +73,6 @@ typedef struct {
 } MPCContext;
 
 void ff_mpc_init(void);
-void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst, int channels);
+void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, int16_t **out, int channels);
 
 #endif /* AVCODEC_MPC_H */