aboutsummaryrefslogtreecommitdiffstats
path: root/doc/libavfilter.texi
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-17 16:55:58 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-03-17 17:26:45 +0100
commita6be21d3baf09be1e22648e4802b955191d26b67 (patch)
tree6762797c6fa93501e2a275340aa8739f0c32e7c6 /doc/libavfilter.texi
parent0fecf2642b9d909820683647c70031a954f5e58d (diff)
downloadffmpeg-a6be21d3baf09be1e22648e4802b955191d26b67.tar.gz
Revert "replace FFmpeg with Libav in doc/"
This reverts commit f8a45fa1b1764b34d4263eacd93411e8ba0484a4. Conflicts: doc/optimization.txt
Diffstat (limited to 'doc/libavfilter.texi')
-rw-r--r--doc/libavfilter.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/libavfilter.texi b/doc/libavfilter.texi
index 6d5698b6be..f0b448259a 100644
--- a/doc/libavfilter.texi
+++ b/doc/libavfilter.texi
@@ -11,10 +11,10 @@
@chapter Introduction
-Libavfilter is the filtering API of Libav. It is the substitute of the
+Libavfilter is the filtering API of FFmpeg. It is the substitute of the
now deprecated 'vhooks' and started as a Google Summer of Code project.
-Integrating libavfilter into the main Libav repository is a work in
+Integrating libavfilter into the main FFmpeg 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 Libav @file{tools}
+The @file{graph2dot} program included in the FFmpeg @file{tools}
directory can be used to parse a filter graph description and issue a
corresponding textual representation in the dot language.