Merge commit 'f5df897c4b61985e3afc89ba1290649712ff438e'

[ffmpeg] / libavcodec / vp9dsp.h

diff --git a/libavcodec/vp9dsp.h b/libavcodec/vp9dsp.h
index 0d24ae17f759b5761fc0689c84bcc9b2f34c3965..e2256316a8f581669ff16cdc4f2c236bf9b5a8fa 100644 (file)
--- a/libavcodec/vp9dsp.h
+++ b/libavcodec/vp9dsp.h
@@ -27,7 +27,7 @@
 #include <stddef.h>
 #include <stdint.h>
 
-#include "vp9.h"
+#include "libavcodec/vp9.h"
 
 typedef void (*vp9_mc_func)(uint8_t *dst, ptrdiff_t dst_stride,
                             const uint8_t *ref, ptrdiff_t ref_stride,
@@ -111,16 +111,15 @@ typedef struct VP9DSPContext {
      *
      * dst/stride are aligned by hsize
      */
-    vp9_mc_func mc[5][4][2][2][2];
+    vp9_mc_func mc[5][N_FILTERS][2][2][2];
 
     /*
      * for scalable MC, first 3 dimensions identical to above, the other two
      * don't exist since it changes per stepsize.
      */
-    vp9_scaled_mc_func smc[5][4][2];
+    vp9_scaled_mc_func smc[5][N_FILTERS][2];
 } VP9DSPContext;
 
-
 extern const int16_t ff_vp9_subpel_filters[3][16][8];
 
 void ff_vp9dsp_init(VP9DSPContext *dsp, int bpp, int bitexact);