Skip to content

Commit f2de911

Browse files
committed
swscale: add opaque parameter to input functions
1 parent ef2c2a2 commit f2de911

File tree

4 files changed

+106
-85
lines changed

4 files changed

+106
-85
lines changed

libswscale/hscale.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,18 @@ static int lum_convert(SwsContext *c, SwsFilterDescriptor *desc, int sliceY, int
105105
uint8_t * dst = desc->dst->plane[0].line[i];
106106

107107
if (c->lumToYV12) {
108-
c->lumToYV12(dst, src[0], src[1], src[2], srcW, pal);
108+
c->lumToYV12(dst, src[0], src[1], src[2], srcW, pal, c->input_opaque);
109109
} else if (c->readLumPlanar) {
110-
c->readLumPlanar(dst, src, srcW, c->input_rgb2yuv_table);
110+
c->readLumPlanar(dst, src, srcW, c->input_rgb2yuv_table, c->input_opaque);
111111
}
112112

113113

114114
if (desc->alpha) {
115115
dst = desc->dst->plane[3].line[i];
116116
if (c->alpToYV12) {
117-
c->alpToYV12(dst, src[3], src[1], src[2], srcW, pal);
117+
c->alpToYV12(dst, src[3], src[1], src[2], srcW, pal, c->input_opaque);
118118
} else if (c->readAlpPlanar) {
119-
c->readAlpPlanar(dst, src, srcW, NULL);
119+
c->readAlpPlanar(dst, src, srcW, NULL, c->input_opaque);
120120
}
121121
}
122122
}
@@ -224,9 +224,9 @@ static int chr_convert(SwsContext *c, SwsFilterDescriptor *desc, int sliceY, int
224224
uint8_t * dst1 = desc->dst->plane[1].line[i];
225225
uint8_t * dst2 = desc->dst->plane[2].line[i];
226226
if (c->chrToYV12) {
227-
c->chrToYV12(dst1, dst2, src[0], src[1], src[2], srcW, pal);
227+
c->chrToYV12(dst1, dst2, src[0], src[1], src[2], srcW, pal, c->input_opaque);
228228
} else if (c->readChrPlanar) {
229-
c->readChrPlanar(dst1, dst2, src, srcW, c->input_rgb2yuv_table);
229+
c->readChrPlanar(dst1, dst2, src, srcW, c->input_rgb2yuv_table, c->input_opaque);
230230
}
231231
}
232232
return sliceH;

0 commit comments

Comments
 (0)