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 /libavformat/mpegts.h | |
| parent | b864af033d41e1628ea02424b5979eaeac51b743 (diff) | |
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 'libavformat/mpegts.h')
| -rw-r--r-- | libavformat/mpegts.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h index ecc3d3374c..86a3eba4e2 100644 --- a/libavformat/mpegts.h +++ b/libavformat/mpegts.h @@ -58,6 +58,8 @@ #define SIT_PID 0x001F /* Selection Information Table */ /* PID from 0x0020 to 0x1FFA may be assigned as needed to PMT, elementary * streams and other data tables */ +#define FIRST_OTHER_PID 0x0020 +#define LAST_OTHER_PID 0x1FFA /* PID 0x1FFB is used by DigiCipher 2/ATSC MGT metadata */ /* PID from 0x1FFC to 0x1FFE may be assigned as needed to PMT, elementary * streams and other data tables */ |