diff options
Diffstat (limited to 'multimedia/x265/files')
| -rw-r--r-- | multimedia/x265/files/patch-arm-assembly | 9 | ||||
| -rw-r--r-- | multimedia/x265/files/patch-warnings | 23 |
2 files changed, 15 insertions, 17 deletions
diff --git a/multimedia/x265/files/patch-arm-assembly b/multimedia/x265/files/patch-arm-assembly index e481269c43f0..dd3f71dd12c4 100644 --- a/multimedia/x265/files/patch-arm-assembly +++ b/multimedia/x265/files/patch-arm-assembly @@ -1,12 +1,3 @@ ---- source/common/arm/blockcopy8.S 2024-09-30 08:38:43.172350000 +0200 -+++ source/common/arm/blockcopy8.S 2024-09-30 09:13:08.635457000 +0200 -@@ -833,5 +833,5 @@ - vmov.u32 r0, d0[0] - uasx r0, r0, r0 -- mov r0, r0, lsr 16 -+ lsr r0, r0, #16 - rsb r0, #1024 - bx lr --- source/common/arm/asm.S 2024-04-04 11:39:50.000000000 +0200 +++ source/common/arm/asm.S 2024-09-30 19:45:33.295896000 +0200 @@ -85,4 +85,9 @@ diff --git a/multimedia/x265/files/patch-warnings b/multimedia/x265/files/patch-warnings index e1a65940be2e..31e3d2416405 100644 --- a/multimedia/x265/files/patch-warnings +++ b/multimedia/x265/files/patch-warnings @@ -331,12 +331,19 @@ + // skip -- prefix if provided if (name[0] == '-' && name[1] == '-') ---- source/common/cudata.cpp 2024-09-13 09:02:55.000000000 -0400 -+++ source/common/cudata.cpp 2024-09-24 00:04:19.872724000 -0400 -@@ -74,5 +74,5 @@ - inline bool isEqualRowOrCol(int addrA, int addrB) - { -- return isEqualCol(addrA, addrB) | isEqualRow(addrA, addrB); -+ return isEqualCol(addrA, addrB) || isEqualRow(addrA, addrB); - } +--- source/encoder/level.cpp 2024-11-22 07:07:34.000000000 -0500 ++++ source/encoder/level.cpp 2025-11-01 20:29:50.066886000 -0400 +@@ -61,13 +61,4 @@ + }; +-static inline int _confirm(x265_param* param, bool bflag, const char* message) +-{ +- if (!bflag) +- return 0; +- +- x265_log(param, X265_LOG_ERROR, "%s\n", message); +- return 1; +-} +- + /* determine minimum decoder level required to decode the described video */ + void determineLevel(const x265_param ¶m, VPS& vps) |