OSDN Git Service

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)
* '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>
1  2 
doc/filters.texi

Simple merge