Merge commit '8e18328b18e69b38a5feae5d10ad01b403a205b6'
authorJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:37:34 +0000 (15:37 -0300)
committerJames Almer <jamrial@gmail.com>
Sat, 21 Oct 2017 18:37:34 +0000 (15:37 -0300)
commitde0b26ce288633846ce3ab4886a25a7e035ee041
treefe7bcfcb1d00f390c69a44f6afd9ad03d9d672e2
parent5045cf27aacb3f53f10a465a84e9f52bc95c1594
parent8e18328b18e69b38a5feae5d10ad01b403a205b6
Merge commit '8e18328b18e69b38a5feae5d10ad01b403a205b6'

* commit '8e18328b18e69b38a5feae5d10ad01b403a205b6':
  lavfi: Drop deprecated filter registration

Merged-by: James Almer <jamrial@gmail.com>
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/version.h