Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 19:31:54 +0000 (21:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 19:31:54 +0000 (21:31 +0200)
commita698efbc9df3c6e503f395f040f5170de3f5cb85
tree27a479627b210e389a6641d332f3641703158683
parentfd1e4d66f18372ad21de51bae223a2b699fed885
parente4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472
Merge commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472'

* commit 'e4c9e59a4547adaaa0ce9f25b0d0c5b91ae15472':
  mpeg: K&R formatting cosmetics

Conflicts:
libavformat/mpegenc.c

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