diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h index 279932a7..23106633 100644 --- a/veejay-current/veejay-server/libvje/internal.h +++ b/veejay-current/veejay-server/libvje/internal.h @@ -370,8 +370,7 @@ extern void contourextract_apply(void *ed, VJFrame *frame, int threshold, extern void diff_apply(void *dd, VJFrame *frame, VJFrame *frame2, int threshold, int reverse, int mode, int feather); extern void chromamagick_apply(VJFrame *frame, VJFrame *frame2, int type, int op0); -extern void colorfadergb_apply(VJFrame *frame, int width, int height, - int opacity, int r, int g, int b); +extern void colorfadergb_apply(VJFrame *frame, int opacity, int r, int g, int b); void lumablend_apply(VJFrame *frame, VJFrame *frame2, int width, int height, int type, int t1, int t2, int op); diff --git a/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.c b/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.c index f86189b9..9513366f 100644 --- a/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.c +++ b/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.c @@ -61,11 +61,10 @@ vj_effect *fadecolorrgb_init(int w,int h) return ve; } -void colorfadergb_apply( VJFrame *frame, int width, int height, - int opacity, int r, int g, int b) +void colorfadergb_apply( VJFrame *frame, int opacity, int r, int g, int b) { unsigned int i, op0, op1; - unsigned int len = width * height; + const int len = frame->len; unsigned int colorCb = 128, colorCr = 128; unsigned int colorY; const int uv_len = frame->uv_len; diff --git a/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.h b/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.h index 7235f004..3b3a5970 100644 --- a/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.h +++ b/veejay-current/veejay-server/libvje/transitions/fadecolorrgb.h @@ -25,7 +25,6 @@ #include vj_effect *fadecolorrgb_init(); -void colorfadergb_apply(VJFrame *frame, int width, int height, - int opacity, int r, int g, int b); +void colorfadergb_apply(VJFrame *frame, int opacity, int r, int g, int b); #endif diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c index 6d16929e..cec3b914 100644 --- a/veejay-current/veejay-server/libvje/vj-effman.c +++ b/veejay-current/veejay-server/libvje/vj-effman.c @@ -579,8 +579,7 @@ static void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,in todo_info->tmp[0] -= (arg[0] / arg[5]); } - colorfadergb_apply(frames[0], frames[0]->width, frames[0]->height, - todo_info->tmp[0], arg[1], arg[2], arg[3]); + colorfadergb_apply(frames[0], todo_info->tmp[0], arg[1], arg[2], arg[3]); break; case VJ_VIDEO_EFFECT_FADECOLOR: if (arg[3] == 0) {