aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/mms.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-28 13:12:04 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-28 13:13:04 +0100
commit03678a32bcb8e1ae5c213e02faf62df166cca05d (patch)
tree035a1b8ab38470337cf066aae3ab1cc60a03c48b /libavformat/mms.c
parent085bd039bb095cdf35ef41932eebbc428c5caa76 (diff)
parent5c8696555abd30a200d0d882e2913f66619fba68 (diff)
downloadffmpeg-03678a32bcb8e1ae5c213e02faf62df166cca05d.tar.gz
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>
Diffstat (limited to 'libavformat/mms.c')
0 files changed, 0 insertions, 0 deletions