Skip to content

Commit 8e50215

Browse files
committed
avfilter/vf_cuda_yadif: Avoid new syntax for vector initialisation
This requires a newer version of CUDA than we want to require.
1 parent 1b41115 commit 8e50215

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

libavfilter/vf_yadif_cuda.cu

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,11 @@ __inline__ __device__ void yadif_double(T *dst,
201201
T m = tex2D<T>(cur, xo + 2, yo + 1);
202202
T n = tex2D<T>(cur, xo + 3, yo + 1);
203203

204-
T spatial_pred = {
205-
spatial_predictor(a.x, b.x, c.x, d.x, e.x, f.x, g.x, h.x, i.x, j.x, k.x, l.x, m.x, n.x),
206-
spatial_predictor(a.y, b.y, c.y, d.y, e.y, f.y, g.y, h.y, i.y, j.y, k.y, l.y, m.y, n.y) };
204+
T spatial_pred;
205+
spatial_pred.x =
206+
spatial_predictor(a.x, b.x, c.x, d.x, e.x, f.x, g.x, h.x, i.x, j.x, k.x, l.x, m.x, n.x);
207+
spatial_pred.y =
208+
spatial_predictor(a.y, b.y, c.y, d.y, e.y, f.y, g.y, h.y, i.y, j.y, k.y, l.y, m.y, n.y);
207209

208210
// Calculate temporal prediction
209211
int is_second_field = !(parity ^ tff);
@@ -226,11 +228,12 @@ __inline__ __device__ void yadif_double(T *dst,
226228
T K = tex2D<T>(next2, xo, yo - 1);
227229
T L = tex2D<T>(next2, xo, yo + 1);
228230

229-
spatial_pred = {
231+
spatial_pred.x =
230232
temporal_predictor(A.x, B.x, C.x, D.x, E.x, F.x, G.x, H.x, I.x, J.x, K.x, L.x,
231-
spatial_pred.x, skip_spatial_check),
233+
spatial_pred.x, skip_spatial_check);
234+
spatial_pred.y =
232235
temporal_predictor(A.y, B.y, C.y, D.y, E.y, F.y, G.y, H.y, I.y, J.y, K.y, L.y,
233-
spatial_pred.y, skip_spatial_check) };
236+
spatial_pred.y, skip_spatial_check);
234237

235238
dst[yo*dst_pitch+xo] = spatial_pred;
236239
}

0 commit comments

Comments
 (0)