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)
commit8f3d3e5f8373d64f4b05dd1908c048dc0e49e21f
treeae329301dcb5904dc74816c053c8ff3932aaf5eb
parent9b53691f731870220d432ec3304bcc5f744c3c96
parent95d312d6c82e7485f43c3ddda0f369af0e41c83b
Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'

* commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b':
  concat: K&R formatting cosmetics

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