Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Feb 2013 12:12:04 +0000 (13:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Feb 2013 12:13:04 +0000 (13:13 +0100)
commit03678a32bcb8e1ae5c213e02faf62df166cca05d
tree035a1b8ab38470337cf066aae3ab1cc60a03c48b
parent085bd039bb095cdf35ef41932eebbc428c5caa76
parent5c8696555abd30a200d0d882e2913f66619fba68
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>
libavformat/Makefile
libavformat/http.c
libavformat/internal.h
libavformat/noproxy-test.c
libavformat/tls.c
libavformat/utils.c
libavformat/version.h