Added --cookie and --user-agent switches. Only one cookie may be specified at the moment, seems to be a bug in ffmpeg's http.c related to newline delimitation of cookies.
Merge branch 'upstream'