Merge remote-tracking branch 'qatar/master'

Browse Source

* 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: 194ef56ba7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

pull/53/head

Michael Niedermayer 11 years ago

parent b148a39d55 d8e763fda7

commit 12bc33d7cd

Whitespace

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available