Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 02:44:23 +0000 (03:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Mar 2014 02:45:16 +0000 (03:45 +0100)
commitf36da16ede525fb4925ad3ec863f131bc6743540
tree460f987b290457bebc9bba558bf2b1777609f656
parentc03af3ac1c4c865fdde5f57df6c2ccc646680f77
parentddfc98906373d1f17f6205cedd14c68d7a75995f
Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'

* commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f':
  http: Support setting custom User-Agent

Conflicts:
doc/protocols.texi
libavformat/http.c

See: 2bb1c713cc7e8fd018a3a0b579145a31a1c47bce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/protocols.texi
libavformat/http.c