diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-07-27 20:56:59 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-08-12 13:27:30 +0200 |
| commit | 6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3 (patch) | |
| tree | ce39de2c1a0f9a48da739fc10a192cca0345efff /cmdutils.c | |
| parent | 791a86c37a03b94207bc2d0ad4cbe7f39d7e495a (diff) | |
| download | ffmpeg-6291d7e41605c0b1e9debfae8a2b1d4cf7b0e0b3.tar.gz | |
Make a copy of ffmpeg under a new name -- avconv.
It will be further developed with a few incompatible changes.
ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
Diffstat (limited to 'cmdutils.c')
| -rw-r--r-- | cmdutils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmdutils.c b/cmdutils.c index f6e50fa534..d3fdae7600 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -754,9 +754,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, { FILE *f = NULL; int i; - const char *base[3]= { getenv("FFMPEG_DATADIR"), + const char *base[3]= { getenv("AVCONV_DATADIR"), getenv("HOME"), - FFMPEG_DATADIR, + AVCONV_DATADIR, }; if (is_path) { @@ -766,11 +766,11 @@ FILE *get_preset_file(char *filename, size_t filename_size, for (i = 0; i < 3 && !f; i++) { if (!base[i]) continue; - snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", preset_name); + snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], i != 1 ? "" : "/.avconv", preset_name); f = fopen(filename, "r"); if (!f && codec_name) { snprintf(filename, filename_size, - "%s%s/%s-%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", codec_name, preset_name); + "%s%s/%s-%s.ffpreset", base[i], i != 1 ? "" : "/.avconv", codec_name, preset_name); f = fopen(filename, "r"); } } |