Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:45:34 +0000 (02:45 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 01:45:34 +0000 (02:45 +0100)
commitdf41cbee85c8aac02646f39a68e2f6b911b73f18
tree2b65fe10dcbe8f0b686cb68efa66456f27fd90ee
parentb752d02f42bbefdf8b198f03f166cc98bffcc8e8
parent7a2fddb4480121712df560cf619c1c3566cae3ff
Merge commit '7a2fddb4480121712df560cf619c1c3566cae3ff'

* commit '7a2fddb4480121712df560cf619c1c3566cae3ff':
  http: K&R formatting cosmetics

Conflicts:
libavformat/http.c

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