[FFmpeg-devel] [PATCH 1/3] ffmpeg_opt:get_preset_file_2(): fix avio_open2() return code check

[Timothy Gu]

Michael Niedermayer <michaelni <at> gmx.at> wrote:

> ret is 1 initially so this would break the code

Fixed.

----

>From 0ca4ecc87bf746829ace342abda8f5b64f414c6a Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99 at gmail.com>
Date: Sat, 22 Feb 2014 13:37:52 -0800
Subject: [PATCH 1/3] ffmpeg_opt: get_preset_file_2(): fix avio_open2() 
return
 code check

avio_open2() only return < 0 when error.

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
---
 ffmpeg_opt.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 5db961a..6a0ba4f 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -977,14 +977,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) {
@@ -992,7 +992,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);
-- 
1.8.3.2