[FFmpeg-cvslog] Merge commit '25d14b716aef43bf9e82f1d67a364e5922332f47' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sun Mar 16 03:29:40 2014 +0100| [a7338ae8acf373244ab28e134f0e09fd745cf383] | committer: Michael Niedermayer

Merge commit '25d14b716aef43bf9e82f1d67a364e5922332f47' into release/2.2

* commit '25d14b716aef43bf9e82f1d67a364e5922332f47':
  http: Refactor process_line

Conflicts:
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7338ae8acf373244ab28e134f0e09fd745cf383
---