[FFmpeg-devel] [PATCH 2/2] ffmpeg_opt/get_preset_file_2(): de-avconv-ize
Timothy Gu
timothygu99 at gmail.com
Fri Feb 7 01:20:59 CET 2014
Signed-off-by: Timothy Gu <timothygu99 at gmail.com>
---
ffmpeg_opt.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c
index 4e0dc47..b41ace3 100644
--- a/ffmpeg_opt.c
+++ b/ffmpeg_opt.c
@@ -980,7 +980,7 @@ static int get_preset_file_2(const char *preset_name, const char *codec_name, AV
{
int i, ret = 1;
char filename[1000];
- const char *base[3] = { getenv("AVCONV_DATADIR"),
+ const char *base[3] = { getenv("FFMPEG_DATADIR"),
getenv("HOME"),
AVCONV_DATADIR,
};
@@ -989,13 +989,13 @@ static int get_preset_file_2(const char *preset_name, const char *codec_name, AV
if (!base[i])
continue;
if (codec_name) {
- snprintf(filename, sizeof(filename), "%s%s/%s-%s.avpreset", base[i],
- i != 1 ? "" : "/.avconv", codec_name, preset_name);
+ snprintf(filename, sizeof(filename), "%s%s/%s-%s.ffpreset", base[i],
+ i != 1 ? "" : "/.ffmpeg", codec_name, preset_name);
ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
}
if (ret) {
- snprintf(filename, sizeof(filename), "%s%s/%s.avpreset", base[i],
- i != 1 ? "" : "/.avconv", preset_name);
+ snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i],
+ i != 1 ? "" : "/.ffmpeg", preset_name);
ret = avio_open2(s, filename, AVIO_FLAG_READ, &int_cb, NULL);
}
}
--
1.8.3.2
More information about the ffmpeg-devel
mailing list