History

swscale/utils: fix sws_getCachedContext check

This logic was inverted, but || was not replaced by &&.

Niklas Haas committed 1 year ago

Commit 2df655b1 parent d1e37eb1 file · +8 −8Browse files

Unified · Split

libswscale/utils.c+8−8
@@ -2548,14 +2548,14 @@ SwsContext *sws_getCachedContext(SwsContext *prev, int srcW, · 2547 unmodified lines
25482548 if (!param)
25492549 param = default_param;
25502550
2551− if (prev && (prev->src_w == srcW ||
2552− prev->src_h == srcH ||
2553− prev->src_format == srcFormat ||
2554− prev->dst_w == dstW ||
2555− prev->dst_h == dstH ||
2556− prev->dst_format == dstFormat ||
2557− prev->flags == flags ||
2558− prev->scaler_params[0] == param[0] ||
2551+ if (prev && (prev->src_w == srcW &&
2552+ prev->src_h == srcH &&
2553+ prev->src_format == srcFormat &&
2554+ prev->dst_w == dstW &&
2555+ prev->dst_h == dstH &&
2556+ prev->dst_format == dstFormat &&
2557+ prev->flags == flags &&
2558+ prev->scaler_params[0] == param[0] &&
25592559 prev->scaler_params[1] == param[1])) {
25602560 return prev;
25612561 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t