diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:21:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-15 21:26:12 +0200 |
| commit | 60dbed6067676d847157fe530b1caed06c77e2ab (patch) | |
| tree | 62d43c9dc8162c8c809cc689f599befb2fdc2bbe /libavformat/http.c | |
| parent | fb33bff990a8327f59d4c7c509bba1f62bbd6c5a (diff) | |
| parent | 4b1f5e5090abed6c618c8ba380cd7d28d140f867 (diff) | |
| download | ffmpeg-60dbed6067676d847157fe530b1caed06c77e2ab.tar.gz | |
Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'
* commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867':
cosmetics: Write NULL pointer inequality checks more compactly
Conflicts:
libavcodec/dvdsubdec.c
libavcodec/h263dec.c
libavcodec/libxvid.c
libavcodec/rv10.c
libavcodec/utils.c
libavformat/format.c
libavformat/matroskadec.c
libavformat/segment.c
libavutil/opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/http.c')
| -rw-r--r-- | libavformat/http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 09b0d6ec07..7480834ec3 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -157,7 +157,7 @@ static int http_open_cnx_internal(URLContext *h, AVDictionary **options) proxy_path = getenv("http_proxy"); use_proxy = !ff_http_match_no_proxy(getenv("no_proxy"), hostname) && - proxy_path != NULL && av_strstart(proxy_path, "http://", NULL); + proxy_path && av_strstart(proxy_path, "http://", NULL); if (!strcmp(proto, "https")) { lower_proto = "tls"; |