[FFmpeg-cvslog] Merge commit 'cabb1681697555e2c319c37c1f30f149207e9434'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 15:11:55 2013 +0200| [4ed0b28a45adf71301ab2030e037ef78eb1974fd] | committer: Michael Niedermayer

Merge commit 'cabb1681697555e2c319c37c1f30f149207e9434'

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

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ed0b28a45adf71301ab2030e037ef78eb1974fd
---