|
|
|
@ -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); |
|
|
|
|