Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 16:11:57 +0000 (18:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 2 Apr 2014 16:25:15 +0000 (18:25 +0200)
commit0652ffc69a99683a4e6e86e5550824c878a75c73
tree06dc03ddbe42bbd0c64a5fc213cec80d4e80fdcd
parent91a0d3af651732d80b5c01777ea1c7ec541ec554
parentb33c64e4c2e0fd2484352c5eef3c667ad094ca27
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>
libavfilter/Makefile
libavfilter/settb.c