projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b761ae0
)
lavfi/vf_thumbnail_cuda: fix operator precedence bug
author
Rodger Combs
<rodger.combs@gmail.com>
Tue, 30 Jul 2019 07:51:43 +0000
(
02:51
-0500)
committer
Timo Rothenpieler
<timo@rothenpieler.org>
Tue, 30 Jul 2019 13:17:22 +0000
(15:17 +0200)
Discovered via a warning when building with clang
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
libavfilter/vf_thumbnail_cuda.cu
patch
|
blob
|
history
diff --git
a/libavfilter/vf_thumbnail_cuda.cu
b/libavfilter/vf_thumbnail_cuda.cu
index
c73e49f
..
d4d4d79
100644
(file)
--- a/
libavfilter/vf_thumbnail_cuda.cu
+++ b/
libavfilter/vf_thumbnail_cuda.cu
@@
-71,7
+71,7
@@
__global__ void Thumbnail_ushort2(cudaTextureObject_t ushort2_tex,
{
ushort2 pixel = tex2D<ushort2>(ushort2_tex, x, y);
atomicAdd(&histogram[(pixel.x + 128) >> 8], 1);
- atomicAdd(&histogram[256 + (
pixel.y + 128) >> 8
], 1);
+ atomicAdd(&histogram[256 + (
(pixel.y + 128) >> 8)
], 1);
}
}