diff --git a/veejay-current/veejay-server/libvje/effects/opacityadv.c b/veejay-current/veejay-server/libvje/effects/opacityadv.c index e6af0095..410b7242 100644 --- a/veejay-current/veejay-server/libvje/effects/opacityadv.c +++ b/veejay-current/veejay-server/libvje/effects/opacityadv.c @@ -48,12 +48,11 @@ vj_effect *opacityadv_init(int w, int h) return ve; } -void opacityadv_apply( VJFrame *frame, VJFrame *frame2, int width, - int height, int opacity, int threshold, - int threshold2) +void opacityadv_apply( VJFrame *frame, VJFrame *frame2, int opacity, + int threshold, int threshold2) { - unsigned int x, y, len = width * height; + unsigned int x, y, len = frame->width * frame->height; uint8_t a1, a2; unsigned int op0, op1; uint8_t *Y = frame->data[0]; @@ -66,8 +65,8 @@ void opacityadv_apply( VJFrame *frame, VJFrame *frame2, int width, op1 = (opacity > 255) ? 255 : opacity; op0 = 255 - op1; - for (y = 0; y < len; y += width) { - for (x = 0; x < width; x++) { + for (y = 0; y < len; y += frame->width) { + for (x = 0; x < frame->width; x++) { a1 = Y[x + y]; a2 = Y2[x + y]; /* diff --git a/veejay-current/veejay-server/libvje/effects/opacityadv.h b/veejay-current/veejay-server/libvje/effects/opacityadv.h index 4dee36a3..351021e0 100644 --- a/veejay-current/veejay-server/libvje/effects/opacityadv.h +++ b/veejay-current/veejay-server/libvje/effects/opacityadv.h @@ -25,8 +25,7 @@ #include vj_effect *opacityadv_init(); -void opacityadv_apply( VJFrame *frame, VJFrame *frame2, int width, - int height, int opacity, int threshold, - int threshold2); +void opacityadv_apply( VJFrame *frame, VJFrame *frame2, int opacity, + int threshold, int threshold2); void opacityadv_free(); #endif diff --git a/veejay-current/veejay-server/libvje/internal.h b/veejay-current/veejay-server/libvje/internal.h index 9a255747..6244a9d4 100644 --- a/veejay-current/veejay-server/libvje/internal.h +++ b/veejay-current/veejay-server/libvje/internal.h @@ -320,8 +320,7 @@ extern void medianfilter_apply( VJFrame *frame, int val); extern void negatechannel_apply( VJFrame *frame, int chan, int val); extern void colormap_apply( VJFrame *frame, int r, int g, int b); extern void opacity_apply(VJFrame *frame, VJFrame *frame2, int opacity); -extern void opacityadv_apply(VJFrame *frame, VJFrame *frame2, int w, - int h, int o, int t1, int t2); +extern void opacityadv_apply(VJFrame *frame, VJFrame *frame2, int o, int t1, int t2); extern void opacitythreshold_apply(VJFrame *frame, VJFrame *frame2, int w, int h, int o, int t1, int t2); diff --git a/veejay-current/veejay-server/libvje/vj-effman.c b/veejay-current/veejay-server/libvje/vj-effman.c index 8223f973..a3dd5cd8 100644 --- a/veejay-current/veejay-server/libvje/vj-effman.c +++ b/veejay-current/veejay-server/libvje/vj-effman.c @@ -520,8 +520,7 @@ static void vj_effman_apply_video_effect( VJFrame **frames, vjp_kf *todo_info,in frames[0]->height, arg[0], arg[1],arg[2]); break; case VJ_VIDEO_EFFECT_THRESHOLD: - opacityadv_apply(frames[0], frames[1], frames[0]->width, - frames[0]->height, arg[0], arg[1], arg[2]); + opacityadv_apply(frames[0], frames[1], arg[0], arg[1], arg[2]); break; case VJ_VIDEO_EFFECT_RGBKEY: rgbkey_apply(frames[0], frames[1], frames[0]->width, frames[0]->height,