The branch, master has been updated
via 2456a39581c3388bcf6f61c66aef36a887537c23 (commit)
from 89f984e3d1d8f1f009c616e0c6425094395fdbdc (commit)
- Log -----------------------------------------------------------------
commit 2456a39581c3388bcf6f61c66aef36a887537c23
Author: Kacper MichajÅow <[email protected]>
AuthorDate: Sun Nov 30 01:56:07 2025 +0100
Commit: Kacper MichajÅow <[email protected]>
CommitDate: Sun Nov 30 03:02:41 2025 +0100
avfilter/avfiltergraph: fix constant string comparision
It's not guaranteed that the conversion filter name string will be
deduplicated to the same memory location. While this is common
optimization to do, we cannot rely on it always happening.
Fixes regression since 8b375b2ffd4377909180241cdc65d63d372a35a3.
Signed-off-by: Kacper MichajÅow <[email protected]>
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c
index a46a7bd408..d5c2ef54e6 100644
--- a/libavfilter/avfiltergraph.c
+++ b/libavfilter/avfiltergraph.c
@@ -570,7 +570,7 @@ retry:
void *b = FF_FIELD_AT(void *, m->offset, link->outcfg);
if (a && b && a != b && !m->can_merge(a, b)) {
for (k = 0; k < num_conv; k++) {
- if (conv_filters[k] == m->conversion_filter)
+ if (!strcmp(conv_filters[k], m->conversion_filter))
break;
}
if (k == num_conv) {
@@ -683,7 +683,7 @@ retry:
for (neg_step = 0; neg_step < neg->nb_mergers; neg_step++) {
const AVFilterFormatsMerger *m = &neg->mergers[neg_step];
- if (m->conversion_filter != conv_filters[k])
+ if (strcmp(m->conversion_filter, conv_filters[k]))
continue;
if ((ret = MERGE(m, inlink)) <= 0 ||
(ret = MERGE(m, outlink)) <= 0) {
-----------------------------------------------------------------------
Summary of changes:
libavfilter/avfiltergraph.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
