mmaldec: limit internal buffering

[ffmpeg] / libavcodec / asv.h

diff --git a/libavcodec/asv.h b/libavcodec/asv.h
index 3440f93bc2fd156c057d8e2cd4d5a40c008ea955..18f7a9571d065ec4f7db1b268768dd84626a01a6 100644 (file)
--- a/libavcodec/asv.h
+++ b/libavcodec/asv.h
@@ -28,18 +28,24 @@
 
 #include <stdint.h>
 
-#include "libavutil/attributes.h"
 #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{
+typedef struct ASV1Context {
     AVCodecContext *avctx;
-    DSPContext dsp;
-    AVFrame picture;
+    BlockDSPContext bdsp;
+    BswapDSPContext bbdsp;
+    FDCTDSPContext fdsp;
+    IDCTDSPContext idsp;
+    PixblockDSPContext pdsp;
     PutBitContext pb;
     GetBitContext gb;
     ScanTable scantable;
@@ -48,7 +54,7 @@ typedef struct ASV1Context{
     int mb_height;
     int mb_width2;
     int mb_height2;
-    DECLARE_ALIGNED(16, DCTELEM, block)[6][64];
+    DECLARE_ALIGNED(16, int16_t, block)[6][64];
     uint16_t intra_matrix[64];
     int q_intra_matrix[64];
     uint8_t *bitstream_buffer;
@@ -62,6 +68,6 @@ extern const uint8_t ff_asv_dc_ccp_tab[8][2];
 extern const uint8_t ff_asv_ac_ccp_tab[16][2];
 extern const uint8_t ff_asv2_level_tab[63][2];
 
-av_cold void ff_asv_common_init(AVCodecContext *avctx);
+void ff_asv_common_init(AVCodecContext *avctx);
 
 #endif /* AVCODEC_ASV_H */