Merge commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:16:26 +0000 (15:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 13:16:35 +0000 (15:16 +0200)
commit5dd8ca7d1b5401d5bfe078f4129db199fe317ad5
treea6f62076e77f0e89e427284976a4a4dd4190de87
parent4ed0b28a45adf71301ab2030e037ef78eb1974fd
parentc84ea750cf765c9d8845fca5546eb0ae25b9c855
Merge commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855'

* commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855':
  mpegts: Make discard_pid() faster for single-program streams

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