ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Aug 29
01:08:57 2014 +0200| [7771daaea7d524e97fe37ad604b67ba859635791] | committer:
Michael Niedermayer
Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'
* commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5':
license: Mention that vf_interlace is GPL, not LGPL
Conflicts:
LICENSE.md
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7771daaea7d524e97fe37ad604b67ba859635791
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
