git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

projects / ffmpeg / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bfbffbd 393596f)

author	Clément Bœsch <u@pkh.me>
	Thu, 23 Jun 2016 06:15:43 +0000 (08:15 +0200)
committer	Clément Bœsch <u@pkh.me>
	Thu, 23 Jun 2016 06:17:31 +0000 (08:17 +0200)
commit	c0ff42bf6468c7440568ec15c81edc52289f0c8a
tree	d4434d86edee2a6028bd2cc9af5da8ae54daa529	tree \| snapshot
parent	bfbffbd7d8fd014a3693c51d7cde9926315a9fa0	commit \| diff
parent	393596f9d51134d6e45d81ae129223f4faea1232	commit \| 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>

libavformat/mpegtsenc.c	diff1 \|	diff2 \|	blob \| history
tests/ref/acodec/s302m	diff1 \|	\|	blob \| history
tests/ref/lavf/ts	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.