Merge commit '25d14b716aef43bf9e82f1d67a364e5922332f47' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 02:29:40 +0000 (03:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 16 Mar 2014 02:29:40 +0000 (03:29 +0100)
commita7338ae8acf373244ab28e134f0e09fd745cf383
tree3ca5e980877003cc89276744c1250da5c6244347
parent6776c2c04fe6af2efe0c7f7eb61497d0003984c3
parent25d14b716aef43bf9e82f1d67a364e5922332f47
Merge commit '25d14b716aef43bf9e82f1d67a364e5922332f47' into release/2.2

* commit '25d14b716aef43bf9e82f1d67a364e5922332f47':
  http: Refactor process_line

Conflicts:
libavformat/http.c

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