virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avconv_opt: fix avio_open2() return code check

Browse Source 
avio_open2() only return < 0 when error.
This commit is contained in:
Timothy Gu 2014-03-29 20:59:45 +00:00 committed by Vittorio Giovara
parent 508a84e672
commit 9e4e35b4d7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
avconv_opt.c
View File

@ -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) 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]; char filename[1000];
const char *base[3] = { getenv("AVCONV_DATADIR"), const char *base[3] = { getenv("AVCONV_DATADIR"),
getenv("HOME"), getenv("HOME"),
AVCONV_DATADIR, 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]) if (!base[i])
continue; continue;
if (codec_name) { 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); i != 1 ? "" : "/.avconv", codec_name, preset_name);
ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL); 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], snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i],
i != 1 ? "" : "/.avconv", preset_name); i != 1 ? "" : "/.avconv", preset_name);
ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL); ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);