History

lavfi: set AVFilterLink.graph on link creation

There is no reason to delay this.

Anton Khirnov committed 2 years ago

Commit 426e33c1 parent ca5c9e82 files · +1 −2Browse files

Showing the changes to libavfilter (2 of 2 files). Show all

Unified · Split

2 files
  1. libavfilter/avfilter.c +1 −0
  2. libavfilter/avfiltergraph.c +0 −2
libavfilter/avfilter.c+1−0
@@ -185,6 +185,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, · 184 unmodified lines
185 link->srcpad = &src->output_pads[srcpad];185 link->srcpad = &src->output_pads[srcpad];
186 link->dstpad = &dst->input_pads[dstpad];186 link->dstpad = &dst->input_pads[dstpad];
187 link->type = src->output_pads[srcpad].type;187 link->type = src->output_pads[srcpad].type;
188 link->graph = src->graph;
188 av_assert0(AV_PIX_FMT_NONE == -1 && AV_SAMPLE_FMT_NONE == -1);189 av_assert0(AV_PIX_FMT_NONE == -1 && AV_SAMPLE_FMT_NONE == -1);
189 link->format = -1;190 link->format = -1;
190 link->colorspace = AVCOL_SPC_UNSPECIFIED;191 link->colorspace = AVCOL_SPC_UNSPECIFIED;
libavfilter/avfiltergraph.c+0−2
@@ -1208,11 +1208,9 @@ static int graph_config_pointers(AVFilterGraph *graph, void *log_ctx) · 1207 unmodified lines
1208 for (i = 0; i < graph->nb_filters; i++) {1208 for (i = 0; i < graph->nb_filters; i++) {
1209 f = graph->filters[i];1209 f = graph->filters[i];
1210 for (j = 0; j < f->nb_inputs; j++) {1210 for (j = 0; j < f->nb_inputs; j++) {
1211 f->inputs[j]->graph = graph;
1212 ff_link_internal(f->inputs[j])->age_index = -1;1211 ff_link_internal(f->inputs[j])->age_index = -1;
1213 }1212 }
1214 for (j = 0; j < f->nb_outputs; j++) {1213 for (j = 0; j < f->nb_outputs; j++) {
1215 f->outputs[j]->graph = graph;
1216 ff_link_internal(f->outputs[j])->age_index = -1;1214 ff_link_internal(f->outputs[j])->age_index = -1;
1217 }1215 }
1218 if (!f->nb_outputs) {1216 if (!f->nb_outputs) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t