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/Makefile | |
parent | 085bd039bb095cdf35ef41932eebbc428c5caa76 (diff) | |
parent | 5c8696555abd30a200d0d882e2913f66619fba68 (diff) |
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/Makefile')
-rw-r--r-- | libavformat/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 44456eab64..03d7e2357b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -441,7 +441,8 @@ OBJS-$(CONFIG_UDP_PROTOCOL) += udp.o SKIPHEADERS-$(CONFIG_FFRTMPCRYPT_PROTOCOL) += rtmpdh.h SKIPHEADERS-$(CONFIG_NETWORK) += network.h rtsp.h -TESTPROGS = seek \ +TESTPROGS = noproxy \ + seek \ srtp \ url \ |