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

Merge commit 'bc1a985b' 


* commit 'bc1a985b':
  lavfi: replace avfilter_open() with avfilter_graph_alloc_filter().

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/internal.h
	libavfilter/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 9da36960 bc1a985b
No related branches found
No related tags found
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.
Please register or to comment