2 Commits

Author	SHA1	Message	Date
Michael Niedermayer	03678a32bc	Merge remote-tracking branch 'qatar/master' ... * 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-28 13:13:04 +01:00
Martin Storsjö	5c8696555a	lavf: Add a fate test for the noproxy pattern matching ... Signed-off-by: Martin Storsjö <martin@martin.st>	2013-02-27 21:32:14 +02:00