Merge branch 'docu' of https://github.com/rdp/FFmpeg
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Oct 2012 19:21:58 +0000 (21:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 15 Oct 2012 19:22:10 +0000 (21:22 +0200)
commit0cc3cd5c654db3b791b92cf4463216f4c52441f6
treeff5621d451244da8b32e624c4295b6551e816c0f
parent547ec4d3034d81f6d1a0e84bf58168d35f50baab
parentdfd085aae2a1ffe02686794140a0f9ee5ddf8386
Merge branch 'docu' of https://github.com/rdp/FFmpeg

* 'docu' of https://github.com/rdp/FFmpeg:
  docu: add word resize to scale filter, to make searching for the word resize simpler
  docu: change verb flite
  docu: add flite ffmpeg example
  docu: fix flite example

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