This logic was inverted, but || was not replaced by &&.
Showing the changes to libswscale (1 of 1 file). Show all
Unified · Split
| @@ -2548,14 +2548,14 @@ SwsContext *sws_getCachedContext(SwsContext *prev, int srcW, · 2547 unmodified lines | |||
| 2548 | if (!param) | 2548 | if (!param) |
| 2549 | param = default_param; | 2549 | param = default_param; |
| 2550 | 2550 | ||
| 2551 | if (prev && (prev->src_w == srcW || | 2551 | if (prev && (prev->src_w == srcW && |
| 2552 | prev->src_h == srcH || | 2552 | prev->src_h == srcH && |
| 2553 | prev->src_format == srcFormat || | 2553 | prev->src_format == srcFormat && |
| 2554 | prev->dst_w == dstW || | 2554 | prev->dst_w == dstW && |
| 2555 | prev->dst_h == dstH || | 2555 | prev->dst_h == dstH && |
| 2556 | prev->dst_format == dstFormat || | 2556 | prev->dst_format == dstFormat && |
| 2557 | prev->flags == flags || | 2557 | prev->flags == flags && |
| 2558 | prev->scaler_params[0] == param[0] || | 2558 | prev->scaler_params[0] == param[0] && |
| 2559 | prev->scaler_params[1] == param[1])) { | 2559 | prev->scaler_params[1] == param[1])) { |
| 2560 | return prev; | 2560 | return prev; |
| 2561 | } | 2561 | } |