diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-11-02 23:41:54 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-11-02 23:41:54 +0000 |
| commit | a75e103432a6c1a385af2a730690f87dde366da6 (patch) | |
| tree | 2e27434ca2d2345afbc7323736e4733e39a42d7b /ffmpeg.c | |
| parent | d71ad089ef6ee97aa5fe332430e98e1368c148cc (diff) | |
Add -fpre option to take a preset file as parameter. The -[avs]pre options no
longer accept filenames, and -fpre should be used instead.
Originally committed as revision 20435 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3775,6 +3775,7 @@ static int opt_preset(const char *opt, const char *arg) FFMPEG_DATADIR, }; + if (*opt != 'f') { for(i=!base[0]; i<2 && !f; i++){ snprintf(filename, sizeof(filename), "%s%s/%s.ffpreset", base[i], i ? "" : "/.ffmpeg", arg); f= fopen(filename, "r"); @@ -3786,8 +3787,7 @@ static int opt_preset(const char *opt, const char *arg) f= fopen(filename, "r"); } } - if(!f && ((arg[0]=='.' && arg[1]=='/') || arg[0]=='/' || - is_dos_path(arg))){ + } else { av_strlcpy(filename, arg, sizeof(filename)); f= fopen(filename, "r"); } @@ -3945,6 +3945,7 @@ static const OptionDef options[] = { { "apre", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_EXPERT, {(void*)opt_preset}, "set the audio options to the indicated preset", "preset" }, { "vpre", OPT_FUNC2 | HAS_ARG | OPT_VIDEO | OPT_EXPERT, {(void*)opt_preset}, "set the video options to the indicated preset", "preset" }, { "spre", OPT_FUNC2 | HAS_ARG | OPT_SUBTITLE | OPT_EXPERT, {(void*)opt_preset}, "set the subtitle options to the indicated preset", "preset" }, + { "fpre", OPT_FUNC2 | HAS_ARG | OPT_EXPERT, {(void*)opt_preset}, "set options to the indicated preset file", "filename" }, { "default", OPT_FUNC2 | HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {(void*)opt_default}, "generic catch all option", "" }, { NULL, }, |