commit 4d56e0969e09a6c74844f7b9c3e68917996fa275
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> Fri Apr 19 23:59:30 2019
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 19 23:59:30 2019
tree 033fb15eef0fc293371b5597b2ac9bdead95dc23
parent 692789b42e9745388119e925d752f35453559199
parent 19564b9ddc06c6dcd05953e91782694197f4d469

Merge "[CFI] Remove function pointer cast of row_decode_worker_hook"

vp9/decoder/vp9_decodeframe.c

diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c
index c75c3d9..ccfb813 100644
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -1839,8 +1839,9 @@
   }
 }
 
-static int row_decode_worker_hook(ThreadData *const thread_data,
-                                  uint8_t **data_end) {
+static int row_decode_worker_hook(void *arg1, void *arg2) {
+  ThreadData *const thread_data = (ThreadData *)arg1;
+  uint8_t **data_end = (uint8_t **)arg2;
   VP9Decoder *const pbi = thread_data->pbi;
   VP9_COMMON *const cm = &pbi->common;
   RowMTWorkerData *const row_mt_worker_data = pbi->row_mt_worker_data;
@@ -2303,7 +2304,7 @@
 
     thread_data->pbi = pbi;
 
-    worker->hook = (VPxWorkerHook)row_decode_worker_hook;
+    worker->hook = row_decode_worker_hook;
     worker->data1 = thread_data;
     worker->data2 = (void *)&row_mt_worker_data->data_end;
   }