* commit 'cabb1681':
  mpegts: Remove one memcpy per packet

Conflicts:
	libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>