* [FFmpeg-devel] [PATCH] avfilter/scale: remove duplicate block
@ 2025-03-19 5:03 Gyan Doshi
2025-03-23 4:36 ` Gyan Doshi
0 siblings, 1 reply; 3+ messages in thread
From: Gyan Doshi @ 2025-03-19 5:03 UTC (permalink / raw)
To: ffmpeg-devel
Added in bb80445813
---
libavfilter/vf_scale.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
index 8c03d7fd8d..293eb11a4e 100644
--- a/libavfilter/vf_scale.c
+++ b/libavfilter/vf_scale.c
@@ -247,22 +247,6 @@ static int check_exprs(AVFilterContext *ctx)
return AVERROR(EINVAL);
}
- if (!IS_SCALE2REF(ctx) &&
- (vars_w[VAR_S2R_MAIN_W] || vars_h[VAR_S2R_MAIN_W] ||
- vars_w[VAR_S2R_MAIN_H] || vars_h[VAR_S2R_MAIN_H] ||
- vars_w[VAR_S2R_MAIN_A] || vars_h[VAR_S2R_MAIN_A] ||
- vars_w[VAR_S2R_MAIN_SAR] || vars_h[VAR_S2R_MAIN_SAR] ||
- vars_w[VAR_S2R_MAIN_DAR] || vars_h[VAR_S2R_MAIN_DAR] ||
- vars_w[VAR_S2R_MDAR] || vars_h[VAR_S2R_MDAR] ||
- vars_w[VAR_S2R_MAIN_HSUB] || vars_h[VAR_S2R_MAIN_HSUB] ||
- vars_w[VAR_S2R_MAIN_VSUB] || vars_h[VAR_S2R_MAIN_VSUB] ||
- vars_w[VAR_S2R_MAIN_N] || vars_h[VAR_S2R_MAIN_N] ||
- vars_w[VAR_S2R_MAIN_T] || vars_h[VAR_S2R_MAIN_T] ||
- vars_w[VAR_S2R_MAIN_POS] || vars_h[VAR_S2R_MAIN_POS]) ) {
- av_log(ctx, AV_LOG_ERROR, "Expressions with scale2ref variables are not valid in scale filter.\n");
- return AVERROR(EINVAL);
- }
-
if (scale->eval_mode == EVAL_MODE_INIT &&
(vars_w[VAR_N] || vars_h[VAR_N] ||
vars_w[VAR_T] || vars_h[VAR_T] ||
--
2.46.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] avfilter/scale: remove duplicate block
2025-03-19 5:03 [FFmpeg-devel] [PATCH] avfilter/scale: remove duplicate block Gyan Doshi
@ 2025-03-23 4:36 ` Gyan Doshi
2025-03-24 10:51 ` Gyan Doshi
0 siblings, 1 reply; 3+ messages in thread
From: Gyan Doshi @ 2025-03-23 4:36 UTC (permalink / raw)
To: ffmpeg-devel
On 2025-03-19 10:33 am, Gyan Doshi wrote:
> Added in bb80445813
Plan to push tomorrow.
Regards,
Gyan
> ---
> libavfilter/vf_scale.c | 16 ----------------
> 1 file changed, 16 deletions(-)
>
> diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c
> index 8c03d7fd8d..293eb11a4e 100644
> --- a/libavfilter/vf_scale.c
> +++ b/libavfilter/vf_scale.c
> @@ -247,22 +247,6 @@ static int check_exprs(AVFilterContext *ctx)
> return AVERROR(EINVAL);
> }
>
> - if (!IS_SCALE2REF(ctx) &&
> - (vars_w[VAR_S2R_MAIN_W] || vars_h[VAR_S2R_MAIN_W] ||
> - vars_w[VAR_S2R_MAIN_H] || vars_h[VAR_S2R_MAIN_H] ||
> - vars_w[VAR_S2R_MAIN_A] || vars_h[VAR_S2R_MAIN_A] ||
> - vars_w[VAR_S2R_MAIN_SAR] || vars_h[VAR_S2R_MAIN_SAR] ||
> - vars_w[VAR_S2R_MAIN_DAR] || vars_h[VAR_S2R_MAIN_DAR] ||
> - vars_w[VAR_S2R_MDAR] || vars_h[VAR_S2R_MDAR] ||
> - vars_w[VAR_S2R_MAIN_HSUB] || vars_h[VAR_S2R_MAIN_HSUB] ||
> - vars_w[VAR_S2R_MAIN_VSUB] || vars_h[VAR_S2R_MAIN_VSUB] ||
> - vars_w[VAR_S2R_MAIN_N] || vars_h[VAR_S2R_MAIN_N] ||
> - vars_w[VAR_S2R_MAIN_T] || vars_h[VAR_S2R_MAIN_T] ||
> - vars_w[VAR_S2R_MAIN_POS] || vars_h[VAR_S2R_MAIN_POS]) ) {
> - av_log(ctx, AV_LOG_ERROR, "Expressions with scale2ref variables are not valid in scale filter.\n");
> - return AVERROR(EINVAL);
> - }
> -
> if (scale->eval_mode == EVAL_MODE_INIT &&
> (vars_w[VAR_N] || vars_h[VAR_N] ||
> vars_w[VAR_T] || vars_h[VAR_T] ||
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-24 10:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-19 5:03 [FFmpeg-devel] [PATCH] avfilter/scale: remove duplicate block Gyan Doshi
2025-03-23 4:36 ` Gyan Doshi
2025-03-24 10:51 ` Gyan Doshi
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git