git.sesse.net Git - movit/commit

]> git.sesse.net Git - movit/commit

projects / movit / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 56ff92c 860d514)

author	Steinar H. Gunderson <sgunderson@bigfoot.com>
	Mon, 10 Mar 2014 23:40:00 +0000 (00:40 +0100)
committer	Steinar H. Gunderson <sgunderson@bigfoot.com>
	Mon, 10 Mar 2014 23:43:58 +0000 (00:43 +0100)
commit	15daf781e6ce00ec37ca806a16e490d59dcb4e24
tree	61af5b552681c2764c600b7a9745aeebe42ee95a	tree \| snapshot
parent	56ff92c5828a143595eeb7a1906418cc30668f9d	commit \| diff
parent	860d514c63758cb91eb301ce4dc08bb984a835b0	commit \| diff

Merge branch 'master' into epoxy

13 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
complex_modulate_effect.cpp	\|	diff2 \|	blob \| history
complex_modulate_effect.h	\|	diff2 \|	blob \| history
complex_modulate_effect_test.cpp	\|	diff2 \|	blob \| history
effect_chain.cpp	diff1 \|	diff2 \|	blob \| history
effect_chain.h	diff1 \|	diff2 \|	blob \| history
effect_chain_test.cpp	diff1 \|	diff2 \|	blob \| history
fft_pass_effect.cpp	diff1 \|	diff2 \|	blob \| history
fft_pass_effect.h	diff1 \|	diff2 \|	blob \| history
resample_effect.cpp	diff1 \|	diff2 \|	blob \| history
resample_effect.h	diff1 \|	diff2 \|	blob \| history
slice_effect.cpp	diff1 \|	diff2 \|	blob \| history
slice_effect.h	diff1 \|	diff2 \|	blob \| history

A library for high-quality, high-performance video filters.