Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 19:42:30 +0000 (21:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 19:42:34 +0000 (21:42 +0200)
commit066d77650173185064b730da5e8040d898c2b45d
tree8451aa08f7963c142c24e04d9e44b23a45dc4c6b
parentcec59eb63feff145dbc4f8e2b8cf363e84b74d48
parent6d6bd3a3db24747ae5e10716f4782129c38951f6
Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'

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

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