diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 18:53:58 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 19:22:52 +0300 |
| commit | 0fecf2642b9d909820683647c70031a954f5e58d (patch) | |
| tree | 36ca02de9fa27a049829fb589517223d2d0ce5f5 /doc/libavfilter.texi | |
| parent | e309fdc7018a1027d187ec27fb1d69a41a4ee167 (diff) | |
| parent | f1f60f5252b0b448adcce0c1c52f3161ee69b9bf (diff) | |
Merge remote-tracking branch 'newdev/master'
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/libavfilter.texi')
| -rw-r--r-- | doc/libavfilter.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/libavfilter.texi b/doc/libavfilter.texi index f0b448259a..6d5698b6be 100644 --- a/doc/libavfilter.texi +++ b/doc/libavfilter.texi @@ -11,10 +11,10 @@ @chapter Introduction -Libavfilter is the filtering API of FFmpeg. It is the substitute of the +Libavfilter is the filtering API of Libav. It is the substitute of the now deprecated 'vhooks' and started as a Google Summer of Code project. -Integrating libavfilter into the main FFmpeg repository is a work in +Integrating libavfilter into the main Libav repository is a work in progress. If you wish to try the unfinished development code of libavfilter then check it out from the libavfilter repository into some directory of your choice by: @@ -74,7 +74,7 @@ not have video output. @chapter graph2dot -The @file{graph2dot} program included in the FFmpeg @file{tools} +The @file{graph2dot} program included in the Libav @file{tools} directory can be used to parse a filter graph description and issue a corresponding textual representation in the dot language. |