generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'

Browse Source 
* commit '393596f9d51134d6e45d81ae129223f4faea1232':
  mpegtsenc: stop impersonating ses in sdt

This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f on
Libav side.

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2016-06-23 08:15:43 +02:00
commit c0ff42bf64
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/mpegtsenc.c
View File

@ -38,6 +38,8 @@
/* write DVB SI sections */ /* write DVB SI sections */
#define DVB_PRIVATE_NETWORK_START 0xff01
/*********************************************/ /*********************************************/
/* mpegts section writer */ /* mpegts section writer */
@ -1802,7 +1804,7 @@ static const AVOption options[] = {
{ .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM }, { .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM },
{ "mpegts_original_network_id", "Set original_network_id field.", { "mpegts_original_network_id", "Set original_network_id field.",
offsetof(MpegTSWrite, original_network_id), AV_OPT_TYPE_INT, 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.", { "mpegts_service_id", "Set service_id field.",
offsetof(MpegTSWrite, service_id), AV_OPT_TYPE_INT, offsetof(MpegTSWrite, service_id), AV_OPT_TYPE_INT,
{ .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM }, { .i64 = 0x0001 }, 0x0001, 0xffff, AV_OPT_FLAG_ENCODING_PARAM },

2
tests/ref/acodec/s302m
View File

@ -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 1589164 tests/data/fate/acodec-s302m.mpegts
f9b6528eee1aea04640ee83400c78689 *tests/data/fate/acodec-s302m.out.wav f9b6528eee1aea04640ee83400c78689 *tests/data/fate/acodec-s302m.out.wav
stddev: 986.97 PSNR: 36.44 MAXDIFF:18642 bytes: 1058400/ 1056708 stddev: 986.97 PSNR: 36.44 MAXDIFF:18642 bytes: 1058400/ 1056708

2
tests/ref/lavf/ts
View File

@ -1,3 +1,3 @@
cca6bca512605bbde20b7aa5cccf4850 *./tests/data/lavf/lavf.ts 38f4b14d43a0e416be8d598628997cbc *./tests/data/lavf/lavf.ts
407020 ./tests/data/lavf/lavf.ts 407020 ./tests/data/lavf/lavf.ts
./tests/data/lavf/lavf.ts CRC=0x71287e25 ./tests/data/lavf/lavf.ts CRC=0x71287e25