Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'

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

Conflicts:
	LICENSE.md

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/LICENSE.md b/LICENSE.md
index e78d932b0bf9b35463ff45b46f48f58453d9516a..e0a431bd2b6b0546917f31b2cb346b91245f1918 100644 (file)
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -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