Commit 7771daae authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '9e8bbe7d'

* commit '9e8bbe7d':
  license: Mention that vf_interlace is GPL, not LGPL

Conflicts:
	LICENSE.md
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 39cd9fdb 9e8bbe7d
......@@ -34,6 +34,7 @@ Specifically, the GPL parts of FFmpeg are:
- vf_geq.c
- vf_histeq.c
- vf_hqdn3d.c
- vf_interlace.c
- vf_kerndeint.c
- vf_mcdeint.c
- vf_mp.c
......
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