Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'

* commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5': license: Mention that vf_interlace is GPL, not LGPL Conflicts: LICENSE.md Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 7771daaea7
parent 39cd9fdbf8 9e8bbe7d4d
commit 7771daaea7
1 changed files with 1 additions and 0 deletions
--- 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