Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Nov 2013 18:09:12 +0000 (19:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 21 Nov 2013 18:09:12 +0000 (19:09 +0100)
commitc0caf7e81493f5d9d4acd013892b651ab39be450
tree382ed15901eab689aacd1bfb41a645f85b5fdc19
parentc8a0a2e990ba80fefe96c3aa6e9ed46bc6001e3a
parentdd249245d012c1eceb57c166e256fc95e74f4bb1
Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'

* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
  filter docs: reference scale and fps filters

Conflicts:
doc/filters.texi

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