diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-23 08:15:43 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-23 08:17:31 +0200 |
| commit | c0ff42bf6468c7440568ec15c81edc52289f0c8a (patch) | |
| tree | d4434d86edee2a6028bd2cc9af5da8ae54daa529 /libavformat/mpegtsenc.c | |
| parent | bfbffbd7d8fd014a3693c51d7cde9926315a9fa0 (diff) | |
| parent | 393596f9d51134d6e45d81ae129223f4faea1232 (diff) | |
| download | ffmpeg-c0ff42bf6468c7440568ec15c81edc52289f0c8a.tar.gz | |
Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'
* commit '393596f9d51134d6e45d81ae129223f4faea1232':
mpegtsenc: stop impersonating ses in sdt
This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7 on
Libav side.
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavformat/mpegtsenc.c')
| -rw-r--r-- | libavformat/mpegtsenc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index f8cd801470..b45a283285 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -38,6 +38,8 @@ /* write DVB SI sections */ +#define DVB_PRIVATE_NETWORK_START 0xff01 + /*********************************************/ /* mpegts section writer */ @@ -1802,7 +1804,7 @@ static const AVOption options[] = { { .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM }, { "mpegts_original_network_id", "Set original_network_id field.", offsetof(MpegTSWrite, original_network_id), AV_OPT_TYPE_INT, - { .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM }, + { .i64 = DVB_PRIVATE_NETWORK_START }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM }, { "mpegts_service_id", "Set service_id field.", offsetof(MpegTSWrite, service_id), AV_OPT_TYPE_INT, { .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM }, |