diff options
| author | Marton Balint <cus@passwd.hu> | 2019-11-11 22:49:15 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2019-12-03 11:00:10 +0100 |
| commit | f5b83d5419a3610f2dedd3f7b82f4a0e84d5a58b (patch) | |
| tree | 0c00ac16c7528e60f85e1ed47aeae408e0f6a500 /doc | |
| parent | b864af033d41e1628ea02424b5979eaeac51b743 (diff) | |
| download | ffmpeg-f5b83d5419a3610f2dedd3f7b82f4a0e84d5a58b.tar.gz | |
avformat/mpegtsenc: allow any sensible PID for elementary and PMT PIDs
This sets the range of the first automatically assigned PMT PID or elementary
stream PID parameters to [0x20, 0x1ffa]. You can still assign manually a PID
for a stream using AVStream->id in the wider [0x10, 0x1ffe] range as specified
by ISO13818-1. But since DVB and ATSC both reserves some PIDs, let's not allow
them to be automatically assigned.
Also make sure that assigned PID numbers are valid and fix the error message
for the previous PID collision checks.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/muxers.texi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 09ded7d48a..5d7ff1ab3b 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1582,11 +1582,12 @@ Advanced Codec Digital HDTV service. @end table @item mpegts_pmt_start_pid @var{integer} -Set the first PID for PMT. Default is @code{0x1000}. Max is @code{0x1f00}. +Set the first PID for PMTs. Default is @code{0x1000}, minimum is @code{0x0020}, +maximum is @code{0x1ffa}. @item mpegts_start_pid @var{integer} -Set the first PID for data packets. Default is @code{0x0100}. Max is -@code{0x0f00}. +Set the first PID for elementary streams. Default is @code{0x0100}, minimum is +@code{0x0020}, maximum is @code{0x1ffa}. @item mpegts_m2ts_mode @var{boolean} Enable m2ts mode if set to @code{1}. Default value is @code{-1} which |