[FFmpeg-cvslog] Merge commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 02:52:17 2014 +0100| [21d4c571fabe7e0bfc6de8214edb88d733b7624f] | committer: Michael Niedermayer

Merge commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa'

* commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa':
  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=21d4c571fabe7e0bfc6de8214edb88d733b7624f
---