Merge commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:14:33 +0000 (16:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:23:32 +0000 (16:23 +0200)
commit0df55e1ba88600a14ed2bd5921fdf8279d63ae08
tree3ae5c6e44af564a24e924c938fb41eddb193300d
parent91062ddef18e94d54e4b37b288c77c11947d8756
parenta22ae9f0c579793f411e2bd7a8db557091a3a4ae
Merge commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae'

* commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae':
  mpegts: Remove one 64-bit integer modulus operation per packet

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