summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-08-13 03:31:12 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-08-13 03:31:12 +0200
commit8c6b8cb4d1b9d53c633d5a0227e057bda3f425a0 (patch)
tree80e1b0ee416315371d08a9687fb09a05b90dec29 /doc
parent0cb233cf46e057c4d4d9352470305de3f569a036 (diff)
doc/avconv.texi: fixup a few ff/av references
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/avconv.texi4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/avconv.texi b/doc/avconv.texi
index d9d20137aa..3b7fd6b347 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -175,7 +175,7 @@ Set the number of video frames to record.
@item -r @var{fps}
Set frame rate (Hz value, fraction or abbreviation), (default = 25).
@item -s @var{size}
-Set frame size. The format is @samp{wxh} (avserver default = 160x128, avconv default = same as source).
+Set frame size. The format is @samp{wxh} (ffserver default = 160x128, avconv default = same as source).
The following abbreviations are recognized:
@table @samp
@item sqcif
@@ -1049,7 +1049,7 @@ the input file in reverse order.
@settitle avconv video converter
@c man begin SEEALSO
-avplay(1), avprobe(1), avserver(1) and the Libav HTML documentation
+ffplay(1), ffprobe(1), ffserver(1) and the FFmpeg HTML documentation
@c man end
@c man begin AUTHORS