[FFmpeg-cvslog] Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug  7 21:42:30 2014 +0200| [066d77650173185064b730da5e8040d898c2b45d] | committer: Michael Niedermayer

Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'

* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
  mpegts: Drop some unnecessary parentheses

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

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