[PATCH 1/4] avfilter/avf_showcwt: Check av_parse_video_rate() for failure
Fixes: CID1539147 Unused value Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/avf_showcwt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/avf_showcwt.c b/libavfilter/avf_showcwt.c index 24d16d9075d..89a019a0d41 100644 --- a/libavfilter/avf_showcwt.c +++ b/libavfilter/avf_showcwt.c @@ -1028,6 +1028,8 @@ static int config_output(AVFilterLink *outlink) s->auto_frame_rate = av_make_q(inlink->sample_rate, s->hop_size); if (strcmp(s->rate_str, "auto")) { ret = av_parse_video_rate(&s->frame_rate, s->rate_str); + if (ret < 0) + return ret; } else { s->frame_rate = s->auto_frame_rate; } -- 2.45.2
Fixes: CID1496940 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/drawutils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavfilter/drawutils.c b/libavfilter/drawutils.c index 1081938d867..95525d38b40 100644 --- a/libavfilter/drawutils.c +++ b/libavfilter/drawutils.c @@ -61,6 +61,7 @@ int ff_fill_rgba_map(uint8_t *rgba_map, enum AVPixelFormat pix_fmt) had0 |= pos == 0; rgba_map[i] = pos; + depthb = db; } if (desc->nb_components == 3) -- 2.45.2
Fixes: CID1598548 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/qsvvpp.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 1c9773df099..6adf9f6e841 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -1099,11 +1099,6 @@ int ff_qsvvpp_create_mfx_session(void *ctx, if (sts < 0) return ff_qsvvpp_print_error(ctx, sts, "Error creating a MFX session"); - else if (sts > 0) { - ff_qsvvpp_print_warning(ctx, sts, - "Warning in MFX session creation"); - return AVERROR_UNKNOWN; - } *psession = session; -- 2.45.2
On Di, 2024-06-11 at 23:59 +0200, Michael Niedermayer wrote:
Fixes: CID1598548 Logically dead code
Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/qsvvpp.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 1c9773df099..6adf9f6e841 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -1099,11 +1099,6 @@ int ff_qsvvpp_create_mfx_session(void *ctx, if (sts < 0) return ff_qsvvpp_print_error(ctx, sts, "Error creating a MFX session"); - else if (sts > 0) { - ff_qsvvpp_print_warning(ctx, sts, - "Warning in MFX session creation"); - return AVERROR_UNKNOWN; - } *psession = session;
LGTM, thx -Haihao
On Wed, Jun 12, 2024 at 08:19:17AM +0000, Xiang, Haihao wrote:
On Di, 2024-06-11 at 23:59 +0200, Michael Niedermayer wrote:
Fixes: CID1598548 Logically dead code
Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/qsvvpp.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/libavfilter/qsvvpp.c b/libavfilter/qsvvpp.c index 1c9773df099..6adf9f6e841 100644 --- a/libavfilter/qsvvpp.c +++ b/libavfilter/qsvvpp.c @@ -1099,11 +1099,6 @@ int ff_qsvvpp_create_mfx_session(void *ctx, if (sts < 0) return ff_qsvvpp_print_error(ctx, sts, "Error creating a MFX session"); - else if (sts > 0) { - ff_qsvvpp_print_warning(ctx, sts, - "Warning in MFX session creation"); - return AVERROR_UNKNOWN; - } *psession = session;
LGTM, thx
will apply thx [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The educated differ from the uneducated as much as the living from the dead. -- Aristotle
Fixes: CID1551694 Use after free (false positive based on assuming that out == in and one is freed and one used) Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/vf_avgblur.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_avgblur.c b/libavfilter/vf_avgblur.c index ced0a2ac282..cbaeb974e5d 100644 --- a/libavfilter/vf_avgblur.c +++ b/libavfilter/vf_avgblur.c @@ -288,7 +288,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const int width = s->planewidth[plane]; if (!(s->planes & (1 << plane))) { - if (out != in) + if (out->data[plane] != in->data[plane]) av_image_copy_plane(out->data[plane], out->linesize[plane], in->data[plane], in->linesize[plane], width * ((s->depth + 7) / 8), height); -- 2.45.2
On Tue, Jun 11, 2024 at 11:59:03PM +0200, Michael Niedermayer wrote:
Fixes: CID1539147 Unused value
Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavfilter/avf_showcwt.c | 2 ++ 1 file changed, 2 insertions(+)
will apply remaining patches of set [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The day soldiers stop bringing you their problems is the day you have stopped leading them. They have either lost confidence that you can help or concluded you do not care. Either case is a failure of leadership. - Colin Powell
participants (2)
-
Michael Niedermayer -
Xiang, Haihao