Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Dec 2012 13:08:01 +0000 (14:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Dec 2012 13:08:01 +0000 (14:08 +0100)
commit1374b5e15b5dd900bb5a69d78491b793db1c7f38
tree17020da146a8d0bb3ead129d9d8727911b839732
parente7d924da30f0bd3cb680f45246526d312d2d2d6f
parent1dd1c1c884b2038291fdabf3916b0a3f88ac6411
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avio: K&R cosmetic formatting

Conflicts:
libavformat/aviobuf.c

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