Merge commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71'

* commit 'd4a8a86c6863ecea208fa2f774690b6df4b5bc71':
  doc: Libavfilter English cleanup

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/64/merge
Michael Niedermayer 11 years ago
commit 275155081f
  1. 906
      doc/filters.texi

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save