diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-01 03:37:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-01 03:37:08 +0100 |
| commit | 92f9b26c1ea9460d3a5ac1e097f1676ce2cd42dd (patch) | |
| tree | 3eba2fe5c2ffbaed9245511b948b5262c6358cdb | |
| parent | ada28b7f72c5cd3a849a0a7f11f3c19dae9d5c67 (diff) | |
| download | ffmpeg-92f9b26c1ea9460d3a5ac1e097f1676ce2cd42dd.tar.gz | |
doc: fix convertion tool references
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/muxers.texi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index c048a88287..a87adf40b9 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -180,7 +180,7 @@ Create fragments that contain up to @var{size} bytes of payload data. Allow the caller to manually choose when to cut fragments, by calling @code{av_write_frame(ctx, NULL)} to write a fragment with the packets written so far. (This is only useful with other -applications integrating libavformat, not from @command{avconv}.) +applications integrating libavformat, not from @command{ffmpeg}.) @end table Additionally, the way the output file is written can be adjusted @@ -209,7 +209,7 @@ This option is implicitly set when writing ismv (Smooth Streaming) files. Smooth Streaming content can be pushed in real time to a publishing point on IIS with this muxer. Example: @example -avconv -re @var{<normal input/transcoding options>} -movflags isml+frag_keyframe -f ismv http://server/publishingpoint.isml/Streams(Encoder1) +ffmpeg -re @var{<normal input/transcoding options>} -movflags isml+frag_keyframe -f ismv http://server/publishingpoint.isml/Streams(Encoder1) @end example @section mpegts |