2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	0652ffc69a	Merge remote-tracking branch 'qatar/master' ... * qatar/master: vf_settb: rename to settb Conflicts: libavfilter/Makefile libavfilter/f_settb.c libavfilter/settb.c libavfilter/vf_settb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2014-04-02 18:25:15 +02:00
Katerina Barone-Adesi	b33c64e4c2	vf_settb: rename to settb ... An audio version of settb (asettb) will be added to this file. Signed-off-by: Diego Biurrun <diego@biurrun.de>	2014-04-02 12:14:10 +02:00