diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 02:04:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 02:04:18 +0100 |
| commit | c832bf0c38a36698684971eca5f779d115b01976 (patch) | |
| tree | 7f1d3016035c77fbcd7b71ca7d22697ab4d6d6ba /libavformat/avio.c | |
| parent | 636273d3d4a8c42f51832e8bf83e566e875916bf (diff) | |
| parent | 2475fdbd047d8956b03f1bfb1e3f896985fd8c7f (diff) | |
| download | ffmpeg-c832bf0c38a36698684971eca5f779d115b01976.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/avdevice: always free detected devices on error
lavf/http: return error from seek on invalid whence
lavf/http: return error on seeking to negative postion
lavf/avio: fix ffurl_alloc error checks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avio.c')
| -rw-r--r-- | libavformat/avio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index a76f9db3b8..e366dfa388 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -270,7 +270,7 @@ int ffurl_open(URLContext **puc, const char *filename, int flags, const AVIOInterruptCB *int_cb, AVDictionary **options) { int ret = ffurl_alloc(puc, filename, flags, int_cb); - if (ret) + if (ret < 0) return ret; if (options && (*puc)->prot->priv_data_class && (ret = av_opt_set_dict((*puc)->priv_data, options)) < 0) @@ -399,7 +399,7 @@ int avio_check(const char *url, int flags) { URLContext *h; int ret = ffurl_alloc(&h, url, flags, NULL); - if (ret) + if (ret < 0) return ret; if (h->prot->url_check) { |