[FFmpeg-cvslog] Merge commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  6 15:16:26 2013 +0200| [5dd8ca7d1b5401d5bfe078f4129db199fe317ad5] | committer: Michael Niedermayer

Merge commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855'

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

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

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