diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-28 13:12:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-28 13:13:04 +0100 |
| commit | 03678a32bcb8e1ae5c213e02faf62df166cca05d (patch) | |
| tree | 035a1b8ab38470337cf066aae3ab1cc60a03c48b /libavformat/subviewer1dec.c | |
| parent | 085bd039bb095cdf35ef41932eebbc428c5caa76 (diff) | |
| parent | 5c8696555abd30a200d0d882e2913f66619fba68 (diff) | |
| download | ffmpeg-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/subviewer1dec.c')
0 files changed, 0 insertions, 0 deletions