[FFmpeg-cvslog] Merge branch 'docu' of https://github.com/rdp/FFmpeg

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 15 21:21:58 2012 +0200| [0cc3cd5c654db3b791b92cf4463216f4c52441f6] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0cc3cd5c654db3b791b92cf4463216f4c52441f6
---