[FFmpeg-cvslog] Merge commit 'ddfc98906373d1f17f6205cedd14c68d7a75995f'

Michael Niedermayer git at videolan.org
Wed Mar 12 03:55:42 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 12 03:44:23 2014 +0100| [f36da16ede525fb4925ad3ec863f131bc6743540] | committer: Michael Niedermayer

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 at gmx.at>

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





More information about the ffmpeg-cvslog mailing list