[FFmpeg-cvslog] Merge commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 27 10:13:13 2013 +0200| [689a1bd917d528c9a84cc1a998159eb31e98ea79] | committer: Michael Niedermayer

Merge commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1'

* commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1':
  http: Pass options through to the nested protocol

Conflicts:
	libavformat/http.c

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

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