* commit '8f8caca2':
  Add support for BDAV/m2ts-mode muxing

Conflicts:
	libavformat/mpegtsenc.c

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