ffmpeg | branch: release/2.2 | Michael Niedermayer <michae...@gmx.at> | Sat Sep
20 14:46:53 2014 +0200| [da1dfea07670d450653c6d36442f80d7614c9fb3] | committer:
Michael Niedermayer
Merge commit '1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe' into release/2.2
* commit '1a7d1793d6d2de4201c2d9fc7056e7c9e202c5fe':
license: Mention that vf_interlace is GPL, not LGPL
Conflicts:
LICENSE
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=da1dfea07670d450653c6d36442f80d7614c9fb3
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
