Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jul 2014 00:08:14 +0000 (02:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jul 2014 00:08:14 +0000 (02:08 +0200)
commit8b59ab1af0ddfe933bfa6b97745b15748c678b4c
treee5a6662e81d8b0c0d12636497880611aeb4e20e8
parentab0f78ea77779e9f87015910ef235b6d1e6d2ccb
parentce2e858f5b3416c2d54f7f8c14e901f75c48b785
Merge commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785'

* commit 'ce2e858f5b3416c2d54f7f8c14e901f75c48b785':
  http: K&R formatting cosmetics

Conflicts:
libavformat/http.c

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