diff options
| author | Niklas Haas <git@haasn.dev> | 2024-12-16 12:25:44 +0100 |
|---|---|---|
| committer | Niklas Haas <git@haasn.dev> | 2024-12-18 17:30:26 +0100 |
| commit | 2df655bc2cf8bc83e282a779b17192555860dc77 (patch) | |
| tree | 77749e3cd3fc26b612d79fe3eef8d903106552ac | |
| parent | d1e37eb0cd9a551383ae675418015c16d6ce1731 (diff) | |
| download | ffmpeg-2df655bc2cf8bc83e282a779b17192555860dc77.tar.gz | |
swscale/utils: fix sws_getCachedContext check
This logic was inverted, but || was not replaced by &&.
Fixes: ed5dd675624c83d9c69b406ce30e4e09f29970e3
Fixes: ticket #11353
Signed-off-by: Niklas Haas <git@haasn.dev>
Sponsored-by: Sovereign Tech Fund
| -rw-r--r-- | libswscale/utils.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 32f90e366e..4dedbfc394 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -2548,14 +2548,14 @@ SwsContext *sws_getCachedContext(SwsContext *prev, int srcW, if (!param) param = default_param; - if (prev && (prev->src_w == srcW || - prev->src_h == srcH || - prev->src_format == srcFormat || - prev->dst_w == dstW || - prev->dst_h == dstH || - prev->dst_format == dstFormat || - prev->flags == flags || - prev->scaler_params[0] == param[0] || + if (prev && (prev->src_w == srcW && + prev->src_h == srcH && + prev->src_format == srcFormat && + prev->dst_w == dstW && + prev->dst_h == dstH && + prev->dst_format == dstFormat && + prev->flags == flags && + prev->scaler_params[0] == param[0] && prev->scaler_params[1] == param[1])) { return prev; } |