diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 23:43:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 23:55:57 +0200 |
| commit | aff0912da551ed93e8e37ae3e4f2d18cc79cdb36 (patch) | |
| tree | 4e2b736dae1acc0cbb91aedbf6073a41af56e180 /doc | |
| parent | 723adfb1df13fae0d0f675af69958993cafd18dd (diff) | |
| parent | f121dbd9f76031d7f6d56261be2f14937a19d2dd (diff) | |
| download | ffmpeg-aff0912da551ed93e8e37ae3e4f2d18cc79cdb36.tar.gz | |
Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'
* commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd':
mpegts: Provide an option to override the pcr period
Conflicts:
doc/muxers.texi
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/muxers.texi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 90967ddbd5..4f8c3c10e4 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -638,6 +638,9 @@ Set the first PID for data packets (default 0x0100, max 0x0f00). Enable m2ts mode if set to 1. Default value is -1 which disables m2ts mode. @item -muxrate @var{number} Set a constant muxrate (default VBR). +@item -pcr_period @var{numer} +Override the default PCR retransmission time (default 20ms), ignored +if variable muxrate is selected. @item -pes_payload_size @var{number} Set minimum PES packet payload in bytes. @item -mpegts_flags @var{flags} |