Fixes Coverity CID 1427183.
Signed-off-by: Marton Balint <c...@passwd.hu>
---
libavfilter/vf_geq.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/libavfilter/vf_geq.c b/libavfilter/vf_geq.c
index 417b92222d..00f02b6ebf 100644
--- a/libavfilter/vf_geq.c
+++ b/libavfilter/vf_geq.c
@@ -375,8 +375,6 @@ static int slice_geq_filter(AVFilterContext *ctx, void
*arg, int jobnr, int nb_j
const int slice_start = (height * jobnr) / nb_jobs;
const int slice_end = (height * (jobnr+1)) / nb_jobs;
int x, y;
- uint8_t *ptr;
- uint16_t *ptr16;
AVExprState *state = av_expr_state_alloc();
double values[VAR_VARS_NB];
@@ -391,8 +389,8 @@ static int slice_geq_filter(AVFilterContext *ctx, void
*arg, int jobnr, int nb_j
return AVERROR(ENOMEM);
if (geq->bps == 8) {
+ uint8_t *ptr = geq->dst + linesize * slice_start;
for (y = slice_start; y < slice_end; y++) {
- ptr = geq->dst + linesize * y;
values[VAR_Y] = y;
for (x = 0; x < width; x++) {
@@ -401,15 +399,15 @@ static int slice_geq_filter(AVFilterContext *ctx, void
*arg, int jobnr, int nb_j
}
ptr += linesize;
}
- }
- else {
+ } else {
+ uint16_t *ptr16 = geq->dst16 + (linesize/2) * slice_start;
for (y = slice_start; y < slice_end; y++) {
- ptr16 = geq->dst16 + (linesize/2) * y;
values[VAR_Y] = y;
for (x = 0; x < width; x++) {
values[VAR_X] = x;
ptr16[x] = av_expr_eval2(geq->e[plane], state, values, geq);
}
+ ptr16 += linesize/2;
}
}
av_expr_state_free(&state);
--
2.16.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
