summaryrefslogtreecommitdiff
path: root/libs/ffvpx/libavcodec/videodsp_template.c
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2022-06-07 20:20:19 -0500
committerMatt A. Tobin <email@mattatobin.com>2022-06-07 20:20:19 -0500
commit878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b (patch)
tree3683d6df35e3618c0e7b456de7c749ca4c8c21a6 /libs/ffvpx/libavcodec/videodsp_template.c
parenta621951327b0c19c0c24dfd9fd973f7bd13ae68f (diff)
parentcfb9884423faf741de03c5fcc72bf9ac8c6ada4d (diff)
downloadaura-central-878ab758d5d4c1ef7badf2bc20ebc7c67dc2165b.tar.gz
Merge branch 'TRUNK' into ARE-5.0
Diffstat (limited to 'libs/ffvpx/libavcodec/videodsp_template.c')
-rw-r--r--libs/ffvpx/libavcodec/videodsp_template.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ffvpx/libavcodec/videodsp_template.c b/libs/ffvpx/libavcodec/videodsp_template.c
index 94c1b7188..55123a584 100644
--- a/libs/ffvpx/libavcodec/videodsp_template.c
+++ b/libs/ffvpx/libavcodec/videodsp_template.c
@@ -44,7 +44,8 @@ void FUNC(ff_emulated_edge_mc)(uint8_t *buf, const uint8_t *src,
src_y = 1 - block_h;
}
if (src_x >= w) {
- src += (w - 1 - src_x) * sizeof(pixel);
+ // The subtracted expression has an unsigned type and must thus not be negative
+ src -= (1 + src_x - w) * sizeof(pixel);
src_x = w - 1;
} else if (src_x <= -block_w) {
src += (1 - block_w - src_x) * sizeof(pixel);