diff options
| author | Michael Niedermayer <[email protected]> | 2012-10-15 21:21:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2012-10-15 21:22:10 +0200 |
| commit | 0cc3cd5c654db3b791b92cf4463216f4c52441f6 (patch) | |
| tree | ff5621d451244da8b32e624c4295b6551e816c0f /doc/examples/metadata.c | |
| parent | 547ec4d3034d81f6d1a0e84bf58168d35f50baab (diff) | |
| parent | dfd085aae2a1ffe02686794140a0f9ee5ddf8386 (diff) | |
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 <[email protected]>
Diffstat (limited to 'doc/examples/metadata.c')
0 files changed, 0 insertions, 0 deletions