commit 54f9711972d478363a53d7be1acf5b8d394919aa
author Wan-Teh Chang <wtc@google.com> Wed Dec 19 15:44:00 2018 -0800
committer Wan-Teh Chang <wtc@google.com> Wed Dec 19 15:44:00 2018 -0800
tree 83923ddb421afe5e65e75ea0cc02614295bfbf3a
parent 79cd069485ea64b517848ea3e59d40b7d4c814d2

Fix function prototype mismatch.

Include config/av1_rtcd.h to detect function prototype mismatch between
declarations and definitions.

Fix two incorrect function prototypes detected this way.

BUG=chromium:916767

Change-Id: If241bf8312aad860727d616eab7d9480af40a950

aom_dsp/x86/intrapred_avx2.c

diff --git a/aom_dsp/x86/intrapred_avx2.c b/aom_dsp/x86/intrapred_avx2.c
index ccb64a8..f684715 100644
--- a/aom_dsp/x86/intrapred_avx2.c
+++ b/aom_dsp/x86/intrapred_avx2.c
@@ -12,6 +12,7 @@
 #include <immintrin.h>
 
 #include "config/aom_dsp_rtcd.h"
+#include "config/av1_rtcd.h"
 #include "aom_dsp/x86/lpf_common_sse2.h"
 #include "aom_ports/mem.h"
 
@@ -1482,9 +1483,10 @@
 void av1_highbd_dr_prediction_z1_avx2(uint16_t *dst, ptrdiff_t stride, int bw,
                                       int bh, const uint16_t *above,
                                       const uint16_t *left, int upsample_above,
-                                      int dx, int dy) {
+                                      int dx, int dy, int bd) {
   (void)left;
   (void)dy;
+  (void)bd;
 
   switch (bw) {
     case 4:
@@ -1911,9 +1913,10 @@
 void av1_highbd_dr_prediction_z3_avx2(uint16_t *dst, ptrdiff_t stride, int bw,
                                       int bh, const uint16_t *above,
                                       const uint16_t *left, int upsample_left,
-                                      int dx, int dy) {
+                                      int dx, int dy, int bd) {
   (void)above;
   (void)dx;
+  (void)bd;
   assert(dx == 1);
   assert(dy > 0);
   if (bw == bh) {

av1/common/av1_txfm.c

diff --git a/av1/common/av1_txfm.c b/av1/common/av1_txfm.c
index 4fbb756..ac43402 100644
--- a/av1/common/av1_txfm.c
+++ b/av1/common/av1_txfm.c
@@ -10,6 +10,7 @@
  */
 
 #include "config/aom_dsp_rtcd.h"
+#include "config/av1_rtcd.h"
 
 #include "av1/common/av1_txfm.h"