[SCM] libav/experimental: avconv_opt: fix avio_open2() return code check

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9e4e35b4d7c43a908944183a58aa389a23116fd6
Author: Timothy Gu <timothygu99 at gmail.com>
Date:   Sat Mar 29 20:59:45 2014 +0000

    avconv_opt: fix avio_open2() return code check
    
    avio_open2() only return < 0 when error.

diff --git a/avconv_opt.c b/avconv_opt.c
index 7bc41c9..fc57f6b 100644
--- a/avconv_opt.c
+++ b/avconv_opt.c
@@ -819,14 +819,14 @@ static uint8_t *get_line(AVIOContext *s)
 
 static int get_preset_file_2(const char *preset_name, const char *codec_name, AVIOContext **s)
 {
-    int i, ret = 1;
+    int i, ret = -1;
     char filename[1000];
     const char *base[3] = { getenv("AVCONV_DATADIR"),
                             getenv("HOME"),
                             AVCONV_DATADIR,
                             };
 
-    for (i = 0; i < FF_ARRAY_ELEMS(base) && ret; i++) {
+    for (i = 0; i < FF_ARRAY_ELEMS(base) && ret < 0; i++) {
         if (!base[i])
             continue;
         if (codec_name) {
@@ -834,7 +834,7 @@ static int get_preset_file_2(const char *preset_name, const char *codec_name, AV
                      i != 1 ? "" : "/.avconv", codec_name, preset_name);
             ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
         }
-        if (ret) {
+        if (ret < 0) {
             snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i],
                      i != 1 ? "" : "/.avconv", preset_name);
             ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);

-- 
Libav/FFmpeg packaging