* commit '2601a944':
  mpegts: Add HEVC definitions

Conflicts:
	libavformat/mpegts.h

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