Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 19:16:06 +0000 (21:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 7 Aug 2014 19:16:06 +0000 (21:16 +0200)
commitec0b08d20b73c9257fad31838ba7837f51dcfee6
tree2783bca755bb1c0d2eed17fe394a9b38a18d7828
parentc6a596f62685e6a446b6e8703d6409b367675134
parentb7b1bf9166ac3102c401295fdd5d4933c512aa50
Merge commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50'

* commit 'b7b1bf9166ac3102c401295fdd5d4933c512aa50':
  mpegts: K&R formatting cosmetics

Conflicts:
libavformat/mpegtsenc.c

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