X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmpc.h;h=cdf49c1a4e373710339beacc9644e81d1ac4a42e;hb=9745f19ffc9031ce480e43d7cf1053b58100d70f;hp=2ee3c6d4160bf51a7b11f2cd6b317d1f40196d34;hpb=1a3459033dc94d3f6e1b7e7c4de227fda369f2bf;p=ffmpeg

diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 2ee3c6d4160..cdf49c1a4e3 100644
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -31,8 +31,8 @@
 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
+#include "bswapdsp.h"
 #include "get_bits.h"
-#include "dsputil.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,9 +49,8 @@ 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;