Imported Upstream version 0.14.2+dfsg1

This commit is contained in:
Sebastian Ramacher 2016-05-24 21:53:01 +02:00
parent fb3990e9e5
commit 41a01dbf05
529 changed files with 25112 additions and 2336 deletions

View file

@ -166,20 +166,23 @@ static void scroll_filter_render(void *data, gs_effect_t *effect)
cx = filter->limit_cx ? filter->cx : base_cx;
cy = filter->limit_cy ? filter->cy : base_cy;
if (cx && cy) {
if (base_cx && base_cy) {
vec2_set(&filter->size_i,
1.0f / (float)base_cx,
1.0f / (float)base_cy);
} else {
vec2_zero(&filter->size_i);
obs_source_skip_video_filter(filter->context);
return;
}
vec2_set(&mul_val,
(float)cx / (float)base_cx,
(float)cy / (float)base_cy);
obs_source_process_filter_begin(filter->context, GS_RGBA,
OBS_NO_DIRECT_RENDERING);
if (!obs_source_process_filter_begin(filter->context, GS_RGBA,
OBS_NO_DIRECT_RENDERING))
return;
gs_effect_set_vec2(filter->param_add, &filter->offset);
gs_effect_set_vec2(filter->param_mul, &mul_val);