[FFmpeg-cvslog] Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov 22 17:26:03 2013 +0100| [1d19f1b196c70cf2bd17d486e833bfa257314ef0] | committer: Michael Niedermayer

Merge commit '393d80cc278e2b2f5c9e7805db176e6f28335a33'

* commit '393d80cc278e2b2f5c9e7805db176e6f28335a33':
  http: Support relative URL redirection

Conflicts:
	libavformat/http.c

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

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