-
Michael Niedermayer authored
* 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>
0652ffc6
* 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>