diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 23:17:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 23:25:46 +0200 |
| commit | ac26d7ea9da4758377624e633ca47cd01e2210d2 (patch) | |
| tree | 950080d0339760a36a44a98dfe70182eb9abf229 /doc/muxers.texi | |
| parent | 8d02a55b1b93bfd0574306631d2de7614bfb47b4 (diff) | |
| parent | a736ae1e96b8718af0962106aa40df5f4b246b55 (diff) | |
| download | ffmpeg-ac26d7ea9da4758377624e633ca47cd01e2210d2.tar.gz | |
Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'
* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55':
doc: Document mpegts muxrate
Conflicts:
doc/muxers.texi
See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/muxers.texi')
| -rw-r--r-- | doc/muxers.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 42a9fdda5f..90967ddbd5 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -637,7 +637,7 @@ Set the first PID for data packets (default 0x0100, max 0x0f00). @item -mpegts_m2ts_mode @var{number} Enable m2ts mode if set to 1. Default value is -1 which disables m2ts mode. @item -muxrate @var{number} -Set muxrate. +Set a constant muxrate (default VBR). @item -pes_payload_size @var{number} Set minimum PES packet payload in bytes. @item -mpegts_flags @var{flags} |