* commit 'b6a47016':
  mpegts: Support HEVC demuxing

Conflicts:
	Changelog
	libavformat/version.h

See: 93c1fe4dMerged-by: Michael Niedermayer <michaelni@gmx.at>