diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:45:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-16 23:45:42 +0200 |
| commit | 84f77f84234e409271852692e736900ee7b2f0fe (patch) | |
| tree | 8183ec61854cdc0a5dbc731aeca2ef73309b4ba7 /libavformat/internal.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/internal.h')
| -rw-r--r-- | libavformat/internal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 4d56388312..d1bbf33603 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -390,6 +390,4 @@ AVRational ff_choose_timebase(AVFormatContext *s, AVStream *st, int min_precissi */ void ff_generate_avci_extradata(AVStream *st); -int ff_http_match_no_proxy(const char *no_proxy, const char *hostname); - #endif /* AVFORMAT_INTERNAL_H */ |