Merge commit '16b7328058fa600d5158c84d9cc621a134eb88bc'

[ffmpeg] / libavcodec / asv.h

diff --git a/libavcodec/asv.h b/libavcodec/asv.h
index ce3c73aba4c231cbd3fbdc7fdaa481552e51d1cb..a0e8fef70324bff80e90e72d6fd994709bd9882a 100644 (file)
--- a/libavcodec/asv.h
+++ b/libavcodec/asv.h
@@ -31,13 +31,21 @@
 #include "libavutil/mem.h"
 
 #include "avcodec.h"
-#include "dsputil.h"
+#include "blockdsp.h"
+#include "bswapdsp.h"
+#include "fdctdsp.h"
+#include "idctdsp.h"
 #include "get_bits.h"
+#include "pixblockdsp.h"
 #include "put_bits.h"
 
 typedef struct ASV1Context{
     AVCodecContext *avctx;
-    DSPContext dsp;
+    BlockDSPContext bdsp;
+    BswapDSPContext bbdsp;
+    FDCTDSPContext fdsp;
+    IDCTDSPContext idsp;
+    PixblockDSPContext pdsp;
     PutBitContext pb;
     GetBitContext gb;
     ScanTable scantable;