diff options
| author | Niklas Haas <git@haasn.dev> | 2024-10-04 13:51:42 +0200 |
|---|---|---|
| committer | Niklas Haas <git@haasn.dev> | 2024-10-07 19:51:34 +0200 |
| commit | 286bdc9cdc6deea081aeff70dfc0e0254be5e283 (patch) | |
| tree | 9ed842d433fc10ed3b845ae2199e3ca6ff7c8a6c /libswscale/swscale.c | |
| parent | 61369484f62e21999116e9b806d0eb4a7cc6a7b4 (diff) | |
| download | ffmpeg-286bdc9cdc6deea081aeff70dfc0e0254be5e283.tar.gz | |
swscale/internal: turn cascaded_tmp into an array
Slightly more convenient to access from the new wrapping code.
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Niklas Haas <git@haasn.dev>
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index ad0cde6ad8..8cb34570f3 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -837,26 +837,26 @@ static int scale_gamma(SwsContext *c, { int ret = scale_internal(c->cascaded_context[0], srcSlice, srcStride, srcSliceY, srcSliceH, - c->cascaded_tmp, c->cascaded_tmpStride, 0, c->srcH); + c->cascaded_tmp[0], c->cascaded_tmpStride[0], 0, c->srcH); if (ret < 0) return ret; if (c->cascaded_context[2]) - ret = scale_internal(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp, - c->cascaded_tmpStride, srcSliceY, srcSliceH, - c->cascaded1_tmp, c->cascaded1_tmpStride, 0, c->dstH); + ret = scale_internal(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp[0], + c->cascaded_tmpStride[0], srcSliceY, srcSliceH, + c->cascaded_tmp[1], c->cascaded_tmpStride[1], 0, c->dstH); else - ret = scale_internal(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp, - c->cascaded_tmpStride, srcSliceY, srcSliceH, + ret = scale_internal(c->cascaded_context[1], (const uint8_t * const *)c->cascaded_tmp[0], + c->cascaded_tmpStride[0], srcSliceY, srcSliceH, dstSlice, dstStride, dstSliceY, dstSliceH); if (ret < 0) return ret; if (c->cascaded_context[2]) { - ret = scale_internal(c->cascaded_context[2], (const uint8_t * const *)c->cascaded1_tmp, - c->cascaded1_tmpStride, c->cascaded_context[1]->dstY - ret, + ret = scale_internal(c->cascaded_context[2], (const uint8_t * const *)c->cascaded_tmp[1], + c->cascaded_tmpStride[1], c->cascaded_context[1]->dstY - ret, c->cascaded_context[1]->dstY, dstSlice, dstStride, dstSliceY, dstSliceH); } @@ -871,12 +871,12 @@ static int scale_cascaded(SwsContext *c, { int ret = scale_internal(c->cascaded_context[0], srcSlice, srcStride, srcSliceY, srcSliceH, - c->cascaded_tmp, c->cascaded_tmpStride, + c->cascaded_tmp[0], c->cascaded_tmpStride[0], 0, c->cascaded_context[0]->dstH); if (ret < 0) return ret; ret = scale_internal(c->cascaded_context[1], - (const uint8_t * const * )c->cascaded_tmp, c->cascaded_tmpStride, + (const uint8_t * const * )c->cascaded_tmp[0], c->cascaded_tmpStride[0], 0, c->cascaded_context[0]->dstH, dstSlice, dstStride, dstSliceY, dstSliceH); return ret; |