diff options
| author | Michael Niedermayer <[email protected]> | 2015-02-26 21:38:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2015-02-26 21:38:52 +0100 |
| commit | 19dbe89f03d0fc97a43a4ac7989e7db2d5bf313b (patch) | |
| tree | f879c4d4aa6f0aa182c08ec4bebfc166d37713e7 /doc/ffmpeg.texi | |
| parent | 50833c9f7b4e1922197a8955669f8ab3589c8cef (diff) | |
| parent | d92c6d82c03b89d565f70e7a8e5b03b25f78f70c (diff) | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
ffmpeg: notify when the thread message queue blocks.
ffmpeg: allow to set the thread message queue size.
lavd/alsa: set frame_size field.
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'doc/ffmpeg.texi')
| -rw-r--r-- | doc/ffmpeg.texi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index 6e51c44f29..6772f2f685 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1158,6 +1158,12 @@ This option enables or disables accurate seeking in input files with the transcoding. Use @option{-noaccurate_seek} to disable it, which may be useful e.g. when copying some streams and transcoding the others. +@item -thread_message_queue @var{size} (@emph{input}) +This option sets the maximum number of queued packets when reading from the +file or device. With low latency / high rate live streams, packets may be +discarded if they are not read in a timely manner; raising this value can +avoid it. + @item -override_ffserver (@emph{global}) Overrides the input specifications from @command{ffserver}. Using this option you can map any input stream to @command{ffserver} and control |