generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmdutils: revert avconv rename of pathes

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-03 00:15:15 +02:00
parent 6233a3a153
commit 3d15853839
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmdutils.c
View File

@ -751,9 +751,9 @@ FILE *get_preset_file(char *filename, size_t filename_size,
{ {
FILE *f = NULL; FILE *f = NULL;
int i; int i;
const char *base[3]= { getenv("AVCONV_DATADIR"), const char *base[3]= { getenv("FFMPEG_DATADIR"),
getenv("HOME"), getenv("HOME"),
AVCONV_DATADIR, FFMPEG_DATADIR,
}; };
if (is_path) { if (is_path) {
@ -780,11 +780,11 @@ FILE *get_preset_file(char *filename, size_t filename_size,
for (i = 0; i < 3 && !f; i++) { for (i = 0; i < 3 && !f; i++) {
if (!base[i]) if (!base[i])
continue; 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"); f = fopen(filename, "r");
if (!f && codec_name) { if (!f && codec_name) {
snprintf(filename, filename_size, 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"); f = fopen(filename, "r");
} }
} }