Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Sep 2014 11:45:25 +0000 (13:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Sep 2014 11:45:30 +0000 (13:45 +0200)
* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
  concat: K&R formatting cosmetics

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

Simple merge