LICENSE · 969aee07e68c5930782bc46f2ac2391db55b8d1b · sixue.cheng / FFmpeg · GitLab

Find file Blame History Permalink

Merge commit '' into release/2.2 · da1dfea0

Michael Niedermayer authored Sep 20, 2014

* commit '1a7d1793

':
  license: Mention that vf_interlace is GPL, not LGPL

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

da1dfea0

This project is licensed under the Other. Learn more