[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Tue Jan 14 14:59:38 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 14 14:53:53 2014 +0100| [12bc33d7cd04d863466d4a2d18a7fbcb59372429] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_yadif: Relicense from GPL to LGPL

Conflicts:
	LICENSE
	configure
	libavfilter/vf_yadif.c
	libavfilter/x86/vf_yadif.asm
	libavfilter/x86/vf_yadif_init.c
	libavfilter/yadif.h

See: 194ef56ba7e659196fe554782d797b1b45c3915f
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12bc33d7cd04d863466d4a2d18a7fbcb59372429
---





More information about the ffmpeg-cvslog mailing list