From 23b20b5cf34e2c78ddc5c7a52ca787402eab9d52 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 8 Jun 2008 10:48:23 +0000 Subject: [PATCH] Search /usr(/local)/share for preset files as well. This also fixed a null pointer dereference if HOME isnt set. Originally committed as revision 13708 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 98973acaa7..c0741956c7 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -3638,19 +3638,25 @@ static int opt_bsf(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 *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"); if(!f){ char *codec_name= *opt == 'v' ? video_codec_name : *opt == 'a' ? audio_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"); } + } if(!f){ fprintf(stderr, "Preset file not found\n");