Skip to content
Snippets Groups Projects
Commit eb0f774d authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '1565cbc6' 


* commit '1565cbc6':
  lavfi: make avfilter_free() remove the filter from its graph.

Conflicts:
	libavfilter/avfilter.c
	libavfilter/avfiltergraph.c
	libavfilter/graphparser.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4fde7053 1565cbc6
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment