History

Merge commit '1565cbc65cbb9f95c11367314a080068895e0cf0'

* commit '1565cbc65cbb9f95c11367314a080068895e0cf0': lavfi: make avfilter_free() remove the filter from its graph. Conflicts: libavfilter/avfilter.c libavfilter/avfiltergraph.c libavfilter/graphparser.c

Michael Niedermayer committed 13 years ago

Commit eb0f7742 parents 4fde705 1565cbc5 files · +32 −10Browse files

Showing the changes to libavfilter/avfilter.c (1 of 5 files). Show all

Unified · Split

libavfilter/avfilter.c+3−0
@@ -571,6 +571,9 @@ void avfilter_free(AVFilterContext *filter) · 570 unmodified lines
571 if (!filter)571 if (!filter)
572 return;572 return;
573 573
574 if (filter->graph)
575 ff_filter_graph_remove_filter(filter->graph, filter);
576
574 if (filter->filter->uninit)577 if (filter->filter->uninit)
575 filter->filter->uninit(filter);578 filter->filter->uninit(filter);
576 579

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