Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'
authorClément Bœsch <u@pkh.me>
Thu, 23 Jun 2016 06:15:43 +0000 (08:15 +0200)
committerClément Bœsch <u@pkh.me>
Thu, 23 Jun 2016 06:17:31 +0000 (08:17 +0200)
commitc0ff42bf6468c7440568ec15c81edc52289f0c8a
treed4434d86edee2a6028bd2cc9af5da8ae54daa529
parentbfbffbd7d8fd014a3693c51d7cde9926315a9fa0
parent393596f9d51134d6e45d81ae129223f4faea1232
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>
libavformat/mpegtsenc.c
tests/ref/acodec/s302m
tests/ref/lavf/ts