summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-07-10 21:25:38 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-07-23 22:53:29 +0200
commit890efee2b80d5b3b5eb087d1f2a472854f66afe3 (patch)
treedd2c02b73703c6ee97320428f96e699d6343c4e1
parent708890e78f3e8ef0497d37ae6851d4b432854568 (diff)
avcodec/h264_loopfilter: Fix incorrect function parameter array size
filter_mb_mbaff_edgev() and filter_mb_mbaff_edgecv() have a function parameter whose expected size depends upon another parameter: It is 2 * bsi + 1 (with bsi always being 1 or 2). This array is declared as const int16_t[7], yet some of the callers with bsi == 1 call it with only an const int16_t[4] available. This leads to -Wstringop-overread warnings from GCC 12.1. This commit fixes these by replacing [7] with [/* 2 * bsi + 1 */], so that the expected range and its dependence on bsi is immediately visible. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/h264_loopfilter.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index 2440cfa831..c164a289b7 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -143,7 +143,7 @@ static av_always_inline void filter_mb_edgecv(uint8_t *pix, int stride,
static av_always_inline void filter_mb_mbaff_edgev(const H264Context *h, uint8_t *pix,
int stride,
- const int16_t bS[7], int bsi,
+ const int16_t bS[ /* 1 + 2 * bsi */ ], int bsi,
int qp, int a, int b,
int intra)
{
@@ -166,7 +166,7 @@ static av_always_inline void filter_mb_mbaff_edgev(const H264Context *h, uint8_t
static av_always_inline void filter_mb_mbaff_edgecv(const H264Context *h,
uint8_t *pix, int stride,
- const int16_t bS[7],
+ const int16_t bS[ /* 1 + 2 * bsi */ ],
int bsi, int qp, int a,
int b, int intra)
{