* commit 'e8049af1':
  mpegts: Do not try to write a PMT larger than SECTION_SIZE

Conflicts:
	libavformat/mpegtsenc.c

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