-
Michael Niedermayer authored
* commit 'ce2e858f': http: K&R formatting cosmetics Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
8b59ab1a
* commit 'ce2e858f': http: K&R formatting cosmetics Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>