github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.

Age	Commit message (Collapse)	Author
2013-06-17	Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'	Michael Niedermayer
	* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c': avf: move ff_http_match_no_proxy to network Conflicts: libavformat/internal.h libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-16	avf: move ff_http_match_no_proxy to network	Luca Barbato
	It is only used by network protocols.
2013-02-28	Merge remote-tracking branch 'qatar/master'	Michael Niedermayer
	* qatar/master: lavf: Add a fate test for the noproxy pattern matching lavf: Handle the environment variable no_proxy more properly Conflicts: libavformat/Makefile libavformat/internal.h libavformat/tls.c libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-27	lavf: Add a fate test for the noproxy pattern matching	Martin Storsjö
	Signed-off-by: Martin Storsjö <martin@martin.st>