Commit a6c7ff3f4e for ffmpeg
commit a6c7ff3f4ec0db95ce2d668dda9975751b6b18ee
Author: Michael Niedermayer <michael@niedermayer.cc>
Date: Wed Oct 7 00:16:29 2026 +0200
avfilter/yadif: cosmetics: Reindent after the previous commit
diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c
index f7f715f3cb..9130509ece 100644
--- a/libavfilter/vf_bwdif.c
+++ b/libavfilter/vf_bwdif.c
@@ -109,7 +109,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
}
static int filter(AVFilterContext *ctx, AVFrame *dstpic,
- int parity, int tff)
+ int parity, int tff)
{
BWDIFContext *bwdif = ctx->priv;
YADIFContext *yadif = &bwdif->yadif;
diff --git a/libavfilter/vf_bwdif_cuda.c b/libavfilter/vf_bwdif_cuda.c
index 9879d12ab4..ea68f3cb4f 100644
--- a/libavfilter/vf_bwdif_cuda.c
+++ b/libavfilter/vf_bwdif_cuda.c
@@ -54,16 +54,16 @@ typedef struct DeintCUDAContext {
#define CHECK_CU(x) FF_CUDA_CHECK_DL(ctx, s->hwctx->internal->cuda_dl, x)
static int call_kernel(AVFilterContext *ctx, CUfunction func,
- CUdeviceptr prev, CUdeviceptr cur, CUdeviceptr next,
- CUarray_format format, int channels,
- int src_width, // Width is pixels per channel
- int src_height, // Height is pixels per channel
- int src_pitch, // Pitch is bytes
- CUdeviceptr dst,
- int dst_width, // Width is pixels per channel
- int dst_height, // Height is pixels per channel
- int dst_pitch, // Pitch is pixels per channel
- int parity, int tff, int clip_max)
+ CUdeviceptr prev, CUdeviceptr cur, CUdeviceptr next,
+ CUarray_format format, int channels,
+ int src_width, // Width is pixels per channel
+ int src_height, // Height is pixels per channel
+ int src_pitch, // Pitch is bytes
+ CUdeviceptr dst,
+ int dst_width, // Width is pixels per channel
+ int dst_height, // Height is pixels per channel
+ int dst_pitch, // Pitch is pixels per channel
+ int parity, int tff, int clip_max)
{
DeintCUDAContext *s = ctx->priv;
YADIFContext *y = &s->yadif;
@@ -123,7 +123,7 @@ exit:
}
static int filter(AVFilterContext *ctx, AVFrame *dst,
- int parity, int tff)
+ int parity, int tff)
{
DeintCUDAContext *s = ctx->priv;
YADIFContext *y = &s->yadif;
@@ -175,18 +175,18 @@ static int filter(AVFilterContext *ctx, AVFrame *dst,
"Deinterlacing plane %d: pixel_size: %d channels: %d\n",
comp->plane, pixel_size, channels);
ret = call_kernel(ctx, func,
- (CUdeviceptr)y->prev->data[i],
- (CUdeviceptr)y->cur->data[i],
- (CUdeviceptr)y->next->data[i],
- format, channels,
- AV_CEIL_RSHIFT(y->cur->width, i ? y->csp->log2_chroma_w : 0),
- AV_CEIL_RSHIFT(y->cur->height, i ? y->csp->log2_chroma_h : 0),
- y->cur->linesize[i],
- (CUdeviceptr)dst->data[i],
- AV_CEIL_RSHIFT(dst->width, i ? y->csp->log2_chroma_w : 0),
- AV_CEIL_RSHIFT(dst->height, i ? y->csp->log2_chroma_h : 0),
- dst->linesize[i] / comp->step,
- parity, tff, clip_max);
+ (CUdeviceptr)y->prev->data[i],
+ (CUdeviceptr)y->cur->data[i],
+ (CUdeviceptr)y->next->data[i],
+ format, channels,
+ AV_CEIL_RSHIFT(y->cur->width, i ? y->csp->log2_chroma_w : 0),
+ AV_CEIL_RSHIFT(y->cur->height, i ? y->csp->log2_chroma_h : 0),
+ y->cur->linesize[i],
+ (CUdeviceptr)dst->data[i],
+ AV_CEIL_RSHIFT(dst->width, i ? y->csp->log2_chroma_w : 0),
+ AV_CEIL_RSHIFT(dst->height, i ? y->csp->log2_chroma_h : 0),
+ dst->linesize[i] / comp->step,
+ parity, tff, clip_max);
if (ret < 0)
goto exit;
}
diff --git a/libavfilter/vf_bwdif_vulkan.c b/libavfilter/vf_bwdif_vulkan.c
index 5f96d2f7a3..4ddb77a840 100644
--- a/libavfilter/vf_bwdif_vulkan.c
+++ b/libavfilter/vf_bwdif_vulkan.c
@@ -103,7 +103,7 @@ fail:
}
static int bwdif_vulkan_filter_frame(AVFilterContext *ctx, AVFrame *dst,
- int parity, int tff)
+ int parity, int tff)
{
BWDIFVulkanContext *s = ctx->priv;
YADIFContext *y = &s->yadif;
@@ -115,8 +115,8 @@ static int bwdif_vulkan_filter_frame(AVFilterContext *ctx, AVFrame *dst,
int ret;
ret = ff_vk_filter_process_Nin(&s->vkctx, &s->e, &s->shd, dst,
- (AVFrame *[]){ y->prev, y->cur, y->next }, 3,
- VK_NULL_HANDLE, 1, ¶ms, sizeof(params));
+ (AVFrame *[]){ y->prev, y->cur, y->next }, 3,
+ VK_NULL_HANDLE, 1, ¶ms, sizeof(params));
if (y->current_field == YADIF_FIELD_END)
y->current_field = YADIF_FIELD_NORMAL;
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 6fe9a97a13..7e6ac171f1 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -226,7 +226,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
}
static int filter(AVFilterContext *ctx, AVFrame *dstpic,
- int parity, int tff)
+ int parity, int tff)
{
YADIFContext *yadif = ctx->priv;
ThreadData td = { .frame = dstpic, .parity = parity, .tff = tff };
diff --git a/libavfilter/vf_yadif_cuda.c b/libavfilter/vf_yadif_cuda.c
index 435657de5d..eacaf28731 100644
--- a/libavfilter/vf_yadif_cuda.c
+++ b/libavfilter/vf_yadif_cuda.c
@@ -54,16 +54,16 @@ typedef struct DeintCUDAContext {
#define CHECK_CU(x) FF_CUDA_CHECK_DL(ctx, s->hwctx->internal->cuda_dl, x)
static int call_kernel(AVFilterContext *ctx, CUfunction func,
- CUdeviceptr prev, CUdeviceptr cur, CUdeviceptr next,
- CUarray_format format, int channels,
- int src_width, // Width is pixels per channel
- int src_height, // Height is pixels per channel
- int src_pitch, // Pitch is bytes
- CUdeviceptr dst,
- int dst_width, // Width is pixels per channel
- int dst_height, // Height is pixels per channel
- int dst_pitch, // Pitch is pixels per channel
- int parity, int tff)
+ CUdeviceptr prev, CUdeviceptr cur, CUdeviceptr next,
+ CUarray_format format, int channels,
+ int src_width, // Width is pixels per channel
+ int src_height, // Height is pixels per channel
+ int src_pitch, // Pitch is bytes
+ CUdeviceptr dst,
+ int dst_width, // Width is pixels per channel
+ int dst_height, // Height is pixels per channel
+ int dst_pitch, // Pitch is pixels per channel
+ int parity, int tff)
{
DeintCUDAContext *s = ctx->priv;
CudaFunctions *cu = s->hwctx->internal->cuda_dl;
@@ -122,7 +122,7 @@ exit:
}
static int filter(AVFilterContext *ctx, AVFrame *dst,
- int parity, int tff)
+ int parity, int tff)
{
DeintCUDAContext *s = ctx->priv;
YADIFContext *y = &s->yadif;
@@ -171,18 +171,18 @@ static int filter(AVFilterContext *ctx, AVFrame *dst,
"Deinterlacing plane %d: pixel_size: %d channels: %d\n",
comp->plane, pixel_size, channels);
ret = call_kernel(ctx, func,
- (CUdeviceptr)y->prev->data[i],
- (CUdeviceptr)y->cur->data[i],
- (CUdeviceptr)y->next->data[i],
- format, channels,
- AV_CEIL_RSHIFT(y->cur->width, i ? y->csp->log2_chroma_w : 0),
- AV_CEIL_RSHIFT(y->cur->height, i ? y->csp->log2_chroma_h : 0),
- y->cur->linesize[i],
- (CUdeviceptr)dst->data[i],
- AV_CEIL_RSHIFT(dst->width, i ? y->csp->log2_chroma_w : 0),
- AV_CEIL_RSHIFT(dst->height, i ? y->csp->log2_chroma_h : 0),
- dst->linesize[i] / comp->step,
- parity, tff);
+ (CUdeviceptr)y->prev->data[i],
+ (CUdeviceptr)y->cur->data[i],
+ (CUdeviceptr)y->next->data[i],
+ format, channels,
+ AV_CEIL_RSHIFT(y->cur->width, i ? y->csp->log2_chroma_w : 0),
+ AV_CEIL_RSHIFT(y->cur->height, i ? y->csp->log2_chroma_h : 0),
+ y->cur->linesize[i],
+ (CUdeviceptr)dst->data[i],
+ AV_CEIL_RSHIFT(dst->width, i ? y->csp->log2_chroma_w : 0),
+ AV_CEIL_RSHIFT(dst->height, i ? y->csp->log2_chroma_h : 0),
+ dst->linesize[i] / comp->step,
+ parity, tff);
if (ret < 0)
goto exit;
}
diff --git a/libavfilter/vf_yadif_videotoolbox.m b/libavfilter/vf_yadif_videotoolbox.m
index b1152987cd..4fb2a9d96a 100644
--- a/libavfilter/vf_yadif_videotoolbox.m
+++ b/libavfilter/vf_yadif_videotoolbox.m
@@ -101,7 +101,7 @@ static void call_kernel(AVFilterContext *ctx,
}
static int filter(AVFilterContext *ctx, AVFrame *dst,
- int parity, int tff) API_AVAILABLE(macos(10.11), ios(8.0))
+ int parity, int tff) API_AVAILABLE(macos(10.11), ios(8.0))
{
YADIFVTContext *s = ctx->priv;
YADIFContext *y = &s->yadif;