Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:17:57 +0000 (12:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Oct 2013 11:17:57 +0000 (12:17 +0100)
commit0436ffc294bab3038268db9f6ad32b3a35fcdc65
treef193551705667193aad8c94cec54cb2b0137ce6e
parenta66ee3dc87c5650016df7dcd00c4ce0202f0c3ce
parent53151723e377b9c43f876e20d7f27a17993256c8
Merge commit '53151723e377b9c43f876e20d7f27a17993256c8'

* commit '53151723e377b9c43f876e20d7f27a17993256c8':
  avio: K&R formatting cosmetics

Conflicts:
libavformat/avio.c

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