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)
* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
  mpegts: Drop some unnecessary parentheses

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

Simple merge