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

1.5 KiB

Raw Blame History

View Raw