Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 22:37:32 +0000 (00:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 Apr 2014 22:37:32 +0000 (00:37 +0200)
commit275155081f2e250b707aa89fec21d09dff6bb8d6
tree8831374e32cdd0fb60a61806aea2d47e1e33e0b7
parent571d2ffa4745a42c6773dceb542a5674005dc597
parentd4a8a86c6863ecea208fa2f774690b6df4b5bc71
Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'

* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
  doc: Libavfilter English cleanup

Conflicts:
doc/filters.texi
doc/libavfilter.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/filters.texi