Commit 18369967 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '556aab8f'

* commit '556aab8f':
  lavfi: use designated initializers in avfilter_class

Conflicts:
	libavfilter/avfilter.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents e066fb54 556aab8f
Markdown is supported
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