diff options
| author | Michael Niedermayer | 2013-06-16 23:45:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2013-06-16 23:45:42 +0200 |
| commit | 84f77f84234e409271852692e736900ee7b2f0fe (patch) | |
| tree | 8183ec61854cdc0a5dbc731aeca2ef73309b4ba7 /libavformat/network.h | |
| parent | 4a522eff006532f28c631f13a604c364102b7a6f (diff) | |
| parent | ec7c51c7868d3ccc66b5cc38bf126258b94f086c (diff) | |
Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
avf: move ff_http_match_no_proxy to network
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
| -rw-r--r-- | libavformat/network.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/network.h b/libavformat/network.h index 3798f97829..d0a1e3174c 100644 --- a/libavformat/network.h +++ b/libavformat/network.h @@ -257,4 +257,6 @@ int ff_listen_connect(int fd, const struct sockaddr *addr, socklen_t addrlen, int timeout, URLContext *h); +int ff_http_match_no_proxy(const char *no_proxy, const char *hostname); + #endif /* AVFORMAT_NETWORK_H */ |