From: Clément Bœsch Date: Thu, 23 Jun 2016 06:15:43 +0000 (+0200) Subject: Merge commit '393596f9d51134d6e45d81ae129223f4faea1232' X-Git-Tag: n3.1~83 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c0ff42bf6468c7440568ec15c81edc52289f0c8a 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 --- c0ff42bf6468c7440568ec15c81edc52289f0c8a diff --cc tests/ref/acodec/s302m index f19eebe,0000000..5eca9e3 mode 100644,000000..100644 --- a/tests/ref/acodec/s302m +++ b/tests/ref/acodec/s302m @@@ -1,4 -1,0 +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 --cc tests/ref/lavf/ts index 1381f09,8512d26..2be3526 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@@ -1,3 -1,3 +1,3 @@@ - cca6bca512605bbde20b7aa5cccf4850 *./tests/data/lavf/lavf.ts -3713c852d6ee217ae6a901619df71111 *./tests/data/lavf/lavf.ts -406456 ./tests/data/lavf/lavf.ts -./tests/data/lavf/lavf.ts CRC=0xb4ca6cdc ++38f4b14d43a0e416be8d598628997cbc *./tests/data/lavf/lavf.ts +407020 ./tests/data/lavf/lavf.ts +./tests/data/lavf/lavf.ts CRC=0x71287e25