History

lavfi: allow user-provided execute() callbacks

Anton Khirnov committed 13 years ago

Commit 0767bfd1 parent 38e15df8 files · +69 −15Browse files

Showing the changes to libavfilter/avfiltergraph.c (1 of 8 files). Show all

Unified · Split

libavfilter/avfiltergraph.c+9−5
@@ -168,11 +168,15 @@ AVFilterContext *avfilter_graph_alloc_filter(AVFilterGraph *graph, · 167 unmodified lines
168{168{
169 AVFilterContext **filters, *s;169 AVFilterContext **filters, *s;
170 170
171 if (graph->thread_type && !graph->internal->thread) {171 if (graph->thread_type && !graph->internal->thread_execute) {
172 int ret = ff_graph_thread_init(graph);172 if (graph->execute) {
173 if (ret < 0) {173 graph->internal->thread_execute = graph->execute;
174 av_log(graph, AV_LOG_ERROR, "Error initializing threading.\n");174 } else {
175 return NULL;175 int ret = ff_graph_thread_init(graph);
176 if (ret < 0) {
177 av_log(graph, AV_LOG_ERROR, "Error initializing threading.\n");
178 return NULL;
179 }
176 }180 }
177 }181 }
178 182

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