Merge commit '1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe' into release/2.2

* commit '1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe': license: Mention that vf_interlace is GPL, not LGPL Conflicts: LICENSE Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-20 14:46:53 +02:00 · 2014-09-20 14:46:53 +02:00 · da1dfea076
commit da1dfea076
parent e940d15a98 1a7d1793d6
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -33,6 +33,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