Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Jan 2014 22:35:38 +0000 (23:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Jan 2014 22:35:38 +0000 (23:35 +0100)
commit896d6a7736c82a181bf17eb240f37645f6b7fa91
treea4deb046f9d19f5c37c45278f49057ade8890d39
parentc2871568cffe5c8a32ac7db35febf4267746395b
parent50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654
Merge commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654'

* commit '50ecf15712354a1d5b3f4dc9a57ff90ed7ee9654':
  avformat: utils: K&R formatting cosmetics

Conflicts:
libavformat/utils.c

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