#define AVCODEC_CAVS_H
#include "cavsdsp.h"
-#include "dsputil.h"
+#include "blockdsp.h"
+#include "h264chroma.h"
+#include "idctdsp.h"
#include "get_bits.h"
#include "videodsp.h"
typedef struct AVSContext {
AVCodecContext *avctx;
- DSPContext dsp;
+ BlockDSPContext bdsp;
+ H264ChromaContext h264chroma;
+ IDCTDSPContext idsp;
VideoDSPContext vdsp;
CAVSDSPContext cdsp;
GetBitContext gb;
6: A3 X2 X3 */
int pred_mode_Y[3*3];
int *top_pred_Y;
- int l_stride, c_stride;
+ ptrdiff_t l_stride, c_stride;
int luma_scan[4];
int qp;
int qp_fixed;
uint8_t *edge_emu_buffer;
int got_keyframe;
- DCTELEM *block;
+ int16_t *block;
} AVSContext;
extern const uint8_t ff_cavs_partition_flags[30];