x265: update to 4.1; keep library for x265 4.0; add back library for x265 3.6
[oi-userland.git] / components / encumbered / x265-3.6 / patches / analysis.patch
blobac9a47b96ba8284d073780a8f46a687890d86631
1 x265_3.1.1/source/encoder/analysis.cpp: In member function 'void x265::Analysis::normFactor(const pixel*, uint32_t, x265::CUData&, int, x265::TextType)':
2 x265_3.1.1/source/encoder/analysis.cpp:3705:38: error: call of overloaded 'log(uint32_t&)' is ambiguous
3 int block = (int)(((log(blockSize) / log(2)) - 2) + 0.5);
6 --- x265_3.1.1/source/encoder/analysis.cpp 2019-07-08 13:10:19.000000000 +0000
7 +++ x265_3.1.1/source/encoder/analysis.cpp.new 2019-07-23 22:23:46.225591843 +0000
8 @@ -3702,7 +3702,7 @@ void Analysis::normFactor(const pixel* s
10 // 2. Calculate ac component
11 uint64_t z_k = 0;
12 - int block = (int)(((log(blockSize) / log(2)) - 2) + 0.5);
13 + int block = (int)(((log((double)blockSize) / log((double)2)) - 2) + 0.5);
14 primitives.cu[block].normFact(src, blockSize, shift, &z_k);
16 // Remove the DC part