diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:49:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:49:47 +0200 |
| commit | 99091ff217440daa33fddcf66170e1a6d630c3a4 (patch) | |
| tree | 8146302a4c2f83b05eb2ecc2a99ec131360e2feb | |
| parent | 5993b962691ae29b6563785d26ef2a19ffa97f4c (diff) | |
| parent | 205a4502d3da9de2db75d2c965c9d065574e9266 (diff) | |
| download | ffmpeg-99091ff217440daa33fddcf66170e1a6d630c3a4.tar.gz | |
Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
doc: Clarify the avconv section about -re
Conflicts:
doc/ffmpeg.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | doc/ffmpeg.texi | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 8bf5feb40c..c03f9a5ac2 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -877,13 +877,12 @@ Dump each input packet to stderr. When dumping packets, also dump the payload. @item -re (@emph{input}) Read input at native frame rate. Mainly used to simulate a grab device. +or live input stream (e.g. when reading from a file). Should not be used +with actual grab devices or live input streams (where it can cause packet +loss). By default @command{ffmpeg} attempts to read the input(s) as fast as possible. This option will slow down the reading of the input(s) to the native frame rate -of the input(s). It is useful for real-time output (e.g. live streaming). If -your input(s) is coming from some other live streaming source (through HTTP or -UDP for example) the server might already be in real-time, thus the option will -likely not be required. On the other hand, this is meaningful if your input(s) -is a file you are trying to push in real-time. +of the input(s). It is useful for real-time output (e.g. live streaming). @item -loop_input Loop over the input stream. Currently it works only for image streams. This option is used for automatic FFserver testing. |