diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-03 00:15:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-03 00:50:08 +0200 |
| commit | 3d1585383962f2de8885ce13c193a546c72b2ebf (patch) | |
| tree | d6a9254ce2385db3aff8ee82c60204b666d02bba | |
| parent | 6233a3a15356739c86c818bdb6ded7796513e127 (diff) | |
| download | ffmpeg-3d1585383962f2de8885ce13c193a546c72b2ebf.tar.gz | |
cmdutils: revert avconv rename of pathes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | cmdutils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmdutils.c b/cmdutils.c index b89b1683b2..3e34c4eb2f 100644 --- a/cmdutils.c +++ b/cmdutils.c @@ -751,9 +751,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, { FILE *f = NULL; int i; - const char *base[3]= { getenv("AVCONV_DATADIR"), + const char *base[3]= { getenv("FFMPEG_DATADIR"), getenv("HOME"), - AVCONV_DATADIR, + FFMPEG_DATADIR, }; if (is_path) { @@ -780,11 +780,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 ? "" : "/.avconv", preset_name); + snprintf(filename, filename_size, "%s%s/%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", preset_name); f = fopen(filename, "r"); if (!f && codec_name) { snprintf(filename, filename_size, - "%s%s/%s-%s.ffpreset", base[i], i != 1 ? "" : "/.avconv", codec_name, preset_name); + "%s%s/%s-%s.ffpreset", base[i], i != 1 ? "" : "/.ffmpeg", codec_name, preset_name); f = fopen(filename, "r"); } } |