Merge commit 'cabb1681697555e2c319c37c1f30f149207e9434'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:11:55 +0000 (15:11 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:11:55 +0000 (15:11 +0200)
commit4ed0b28a45adf71301ab2030e037ef78eb1974fd
tree209bdb5ca360c06548c6f67a7acbf08b75742051
parent8878aef04882f1bb6db9f56a2b228865e1c2bb75
parentcabb1681697555e2c319c37c1f30f149207e9434
Merge commit 'cabb1681697555e2c319c37c1f30f149207e9434'

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

Conflicts:
libavformat/mpegts.c

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