X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmpc.h;h=39b8d6302db3225d5519a6d5883fd3dc51b28eee;hb=3df77b58e35a30ed550f99936a308f6bd2f47a20;hp=1a6e7943afe1eb5bfe2241cf104e581a13df0356;hpb=0eea212943544d40f99b05571aa7159d78667154;p=ffmpeg

diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 1a6e7943afe..39b8d6302db 100644
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -30,9 +30,9 @@
 #define AVCODEC_MPC_H
 
 #include "libavutil/lfg.h"
+
 #include "avcodec.h"
-#include "get_bits.h"
-#include "dsputil.h"
+#include "bswapdsp.h"
 #include "mpegaudio.h"
 #include "mpegaudiodsp.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,11 +49,9 @@ typedef struct {
     int Q[2];
 }Band;
 
-typedef struct {
-    AVFrame frame;
-    DSPContext dsp;
+typedef struct MPCContext {
+    BswapDSPContext bdsp;
     MPADSPContext mpadsp;
-    GetBitContext gb;
     int IS, MSS, gapless;
     int lastframelen;
     int maxbands, last_max_band;
@@ -73,6 +71,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 */