libopusenc: prevent an out-of-bounds read by returning early

[ffmpeg] / libavcodec / cavs.h

diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h
index d33ff0a32bc9f40293247e1dff21c3c70c66dbb1..cfae05576b06d52ac0ceea3cf4d878856d8ab9db 100644 (file)
--- a/libavcodec/cavs.h
+++ b/libavcodec/cavs.h
@@ -23,8 +23,9 @@
 #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"
 
@@ -161,8 +162,9 @@ typedef struct AVSFrame {
 
 typedef struct AVSContext {
     AVCodecContext *avctx;
-    DSPContext       dsp;
+    BlockDSPContext bdsp;
     H264ChromaContext h264chroma;
+    IDCTDSPContext idsp;
     VideoDSPContext vdsp;
     CAVSDSPContext  cdsp;
     GetBitContext gb;
@@ -210,7 +212,7 @@ typedef struct AVSContext {
        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;