RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

Search /usr(/local)/share for preset files as well.

Browse Source 
This also fixed a null pointer dereference if HOME isnt set.

Originally committed as revision 13708 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-06-08 10:48:23 +00:00
parent 59c2959d07
commit 23b20b5cf3
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ffmpeg.c
View File

@ -3638,19 +3638,25 @@ static int opt_bsf(const char *opt, const char *arg)
static int opt_preset(const char *opt, const char *arg) static int opt_preset(const char *opt, const char *arg)
{ {
FILE *f; FILE *f=NULL;
char tmp[100], tmp2[100]; char tmp[100], tmp2[100];
char *home= getenv("HOME"); int i;
const char *base[3]= { getenv("HOME"),
"/usr/local/share",
"/usr/share",
};
snprintf(tmp, sizeof(tmp), "%s/.ffmpeg/%s.ffpreset", home, arg); for(i=!base[0]; i<3 && !f; i++){
snprintf(tmp, sizeof(tmp), "%s/%sffmpeg/%s.ffpreset", base[i], i ? "" : ".", arg);
f= fopen(tmp, "r"); f= fopen(tmp, "r");
if(!f){ if(!f){
char *codec_name= *opt == 'v' ? video_codec_name : char *codec_name= *opt == 'v' ? video_codec_name :
*opt == 'a' ? audio_codec_name : *opt == 'a' ? audio_codec_name :
subtitle_codec_name; subtitle_codec_name;
snprintf(tmp, sizeof(tmp), "%s/.ffmpeg/%s-%s.ffpreset", home, codec_name, arg); snprintf(tmp, sizeof(tmp), "%s/%sffmpeg/%s-%s.ffpreset", base[i], i ? "" : ".", codec_name, arg);
f= fopen(tmp, "r"); f= fopen(tmp, "r");
} }
}
if(!f){ if(!f){
fprintf(stderr, "Preset file not found\n"); fprintf(stderr, "Preset file not found\n");