summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-09-28 13:09:29 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-09-28 13:09:29 +0000
commit4e72f129c3cbd51b452b1676146fb85af089475a (patch)
tree76e9eedbc298ef6889dd2ccea05227e48833274f /ffmpeg.c
parent7a8b7634c58099402c0cb434d35fa6b9f1fd9d33 (diff)
downloadffmpeg-4e72f129c3cbd51b452b1676146fb85af089475a.tar.gz
Support loading presets from random paths.
Fixes issue659. Originally committed as revision 15443 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index c7ea0f0746..cb72c4314d 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3740,6 +3740,9 @@ static int opt_preset(const char *opt, const char *arg)
f= fopen(tmp, "r");
}
}
+ if(!f && ((arg[0]=='.' && arg[1]=='/') || arg[0]=='/')){
+ f= fopen(arg, "r");
+ }
if(!f){
fprintf(stderr, "Preset file not found\n");