Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'

* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55': doc: Document mpegts muxrate Conflicts: doc/muxers.texi See: 5b76c3a120 Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · ac26d7ea9d
parent 8d02a55b1b a736ae1e96
commit ac26d7ea9d
1 changed files with 1 additions and 1 deletions
--- 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}