[FFmpeg-cvslog] lavf/avio: fix ffurl_alloc error checks

Lukasz Marek git at videolan.org
Thu Mar 6 02:09:18 CET 2014


ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki at gmail.com> | Fri Feb 28 01:12:07 2014 +0100| [f495fbe76a2665cdea092999ca2dbb603d13280c] | committer: Lukasz Marek

lavf/avio: fix ffurl_alloc error checks

ffurl_alloc doc says it returns >= 0 in case of success.
avio treats non-zero as errors.

Signed-off-by: Lukasz Marek <lukasz.m.luki at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f495fbe76a2665cdea092999ca2dbb603d13280c
---

 libavformat/avio.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/avio.c b/libavformat/avio.c
index a76f9db..e366dfa 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) {



More information about the ffmpeg-cvslog mailing list