-
Michael Niedermayer authored
* commit 'dd249245': filter docs: reference scale and fps filters Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
c0caf7e8
* commit 'dd249245': filter docs: reference scale and fps filters Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>