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 | |
| parent | bfbffbd7d8fd014a3693c51d7cde9926315a9fa0 (diff) | |
| parent | 393596f9d51134d6e45d81ae129223f4faea1232 (diff) | |
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>
| -rw-r--r-- | libavformat/mpegtsenc.c | 4 | ||||
| -rw-r--r-- | tests/ref/acodec/s302m | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/ts | 2 |
3 files changed, 5 insertions, 3 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 }, diff --git a/tests/ref/acodec/s302m b/tests/ref/acodec/s302m index f19eebe7a2..5eca9e3a6b 100644 --- a/tests/ref/acodec/s302m +++ b/tests/ref/acodec/s302m @@ -1,4 +1,4 @@ -2d1494ad78292dca556fd079ec27f28d *tests/data/fate/acodec-s302m.mpegts +f6908214498489799b50e332ac42ebf3 *tests/data/fate/acodec-s302m.mpegts 1589164 tests/data/fate/acodec-s302m.mpegts f9b6528eee1aea04640ee83400c78689 *tests/data/fate/acodec-s302m.out.wav stddev: 986.97 PSNR: 36.44 MAXDIFF:18642 bytes: 1058400/ 1056708 diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index 1381f09f19..2be3526c7c 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -cca6bca512605bbde20b7aa5cccf4850 *./tests/data/lavf/lavf.ts +38f4b14d43a0e416be8d598628997cbc *./tests/data/lavf/lavf.ts 407020 ./tests/data/lavf/lavf.ts ./tests/data/lavf/lavf.ts CRC=0x71287e25 |