Commit 9c010ba6 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '0d449c81'

* commit '0d449c81':
  lavfi: Add library identifier

Conflicts:
	libavfilter/version.h

See: a70b4935Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 818ff7ff 0d449c81
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