summaryrefslogtreecommitdiffstats
path: root/libhb
diff options
context:
space:
mode:
authorsr55 <[email protected]>2013-09-21 20:21:47 +0000
committersr55 <[email protected]>2013-09-21 20:21:47 +0000
commitab17c5c37fcc9a9f8a1617505b3131b9196f1549 (patch)
tree3451f902d6b4ef861a0292ea9a94dda165685a19 /libhb
parentf69b7f1dfc98c90d454078f1a3aabef3bae36fd2 (diff)
Tidyup a warning in oclscale.c
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5793 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb')
-rw-r--r--libhb/oclscale.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libhb/oclscale.c b/libhb/oclscale.c
index 904183340..da05f371e 100644
--- a/libhb/oclscale.c
+++ b/libhb/oclscale.c
@@ -72,10 +72,10 @@ int hb_ocl_scale_func( void **data, KernelEnv *kenv )
int crop_bottom = data[3];
int crop_left = data[4];
int crop_right = data[5];
- int in_frame_w = (int)data[6];
- int in_frame_h = (int)data[7];
- int out_frame_w = (int)data[8];
- int out_frame_h = (int)data[9];
+ cl_int in_frame_w = (int)data[6];
+ cl_int in_frame_h = (int)data[7];
+ cl_int out_frame_w = (int)data[8];
+ cl_int out_frame_h = (int)data[9];
hb_oclscale_t *os = data[10];
hb_buffer_t *in = data[11];
hb_buffer_t *out = data[12];
@@ -143,10 +143,10 @@ int hb_ocl_scale_func( void **data, KernelEnv *kenv )
OCLCHECK( clSetKernelArg, os->m_kernel, 13, sizeof(cl_int), &dstRowWords0 );
OCLCHECK( clSetKernelArg, os->m_kernel, 14, sizeof(cl_int), &dstRowWords1 );
OCLCHECK( clSetKernelArg, os->m_kernel, 15, sizeof(cl_int), &dstRowWords2 );
- OCLCHECK( clSetKernelArg, os->m_kernel, 16, sizeof(int), &in_frame_w ); // FIXME: type mismatch
- OCLCHECK( clSetKernelArg, os->m_kernel, 17, sizeof(int), &in_frame_h ); //
- OCLCHECK( clSetKernelArg, os->m_kernel, 18, sizeof(int), &out_frame_w ); //
- OCLCHECK( clSetKernelArg, os->m_kernel, 19, sizeof(int), &out_frame_h ); //
+ OCLCHECK( clSetKernelArg, os->m_kernel, 16, sizeof(cl_int), &in_frame_w );
+ OCLCHECK( clSetKernelArg, os->m_kernel, 17, sizeof(cl_int), &in_frame_h );
+ OCLCHECK( clSetKernelArg, os->m_kernel, 18, sizeof(cl_int), &out_frame_w );
+ OCLCHECK( clSetKernelArg, os->m_kernel, 19, sizeof(cl_int), &out_frame_h );
OCLCHECK( clSetKernelArg, os->m_kernel, 20, sizeof(cl_mem), &os->bicubic_x_weights );
OCLCHECK( clSetKernelArg, os->m_kernel, 21, sizeof(cl_mem), &os->bicubic_y_weights );