diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 16:46:53 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-20 16:46:53 +0400 |
| commit | da1dfea07670d450653c6d36442f80d7614c9fb3 (patch) | |
| tree | 601f2d1d30f905f886101541ecdbc73210ec791e | |
| parent | e940d15a98cb91a991e226fbbfba669c6601e90a (diff) | |
| parent | 1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe (diff) | |
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>
| -rw-r--r-- | LICENSE | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |