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)
* commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855':
  mpegts: Make discard_pid() faster for single-program streams

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

Simple merge